From c50891c3557f9149c0e17686f9ad16cf1c6ec9df Mon Sep 17 00:00:00 2001 From: PurHur Date: Sat, 23 May 2026 17:42:03 +0000 Subject: [PATCH] Remove duplicate php-types-reference patch; fix apply order. Keep php-types-cfg-reference (applies after nullable-return) and drop the broken php-types-reference.patch that never applied on fresh vendor. Refs #1074. Co-authored-by: Cursor --- patches/php-types-reference.patch | 13 ------------- script/apply-patches.sh | 4 ---- 2 files changed, 17 deletions(-) delete mode 100644 patches/php-types-reference.patch diff --git a/patches/php-types-reference.patch b/patches/php-types-reference.patch deleted file mode 100644 index fdf3c8759..000000000 --- a/patches/php-types-reference.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- vendor/ircmaxell/php-types/lib/PHPTypes/Type.php -+++ vendor/ircmaxell/php-types/lib/PHPTypes/Type.php -@@ -304,6 +304,10 @@ - new self(self::TYPE_NULL), - ]))->simplify(); - } -+ if ($decl instanceof CfgType\Reference) { -+ return self::fromDecl($decl->declaration->value); -+ } -+ - throw new \LogicException('Unsupported declaration type: '.get_class($decl)); - } - diff --git a/script/apply-patches.sh b/script/apply-patches.sh index 9d33ab7ec..bd8d3d739 100755 --- a/script/apply-patches.sh +++ b/script/apply-patches.sh @@ -71,9 +71,6 @@ patch_already_applied() { php-cfg-nullsafe-parser.patch) grep -q 'function parseExpr_NullsafePropertyFetch' "$ROOT/vendor/ircmaxell/php-cfg/lib/PHPCfg/Parser.php" 2>/dev/null ;; - php-types-reference.patch) - grep -q 'instanceof CfgType\\Reference' "$ROOT/vendor/ircmaxell/php-types/lib/PHPTypes/Type.php" 2>/dev/null - ;; php-cfg-strict-types.patch) grep -q 'public \$strictTypes' "$ROOT/vendor/ircmaxell/php-cfg/lib/PHPCfg/Func.php" 2>/dev/null ;; @@ -162,7 +159,6 @@ if [[ -d "$ROOT/vendor/ircmaxell/php-types" ]]; then apply_patch "$PATCH_DIR/php-types-dollars-brace.patch" apply_patch "$PATCH_DIR/php-types-mixed-reserved.patch" apply_patch "$PATCH_DIR/php-types-nullsafe.patch" - apply_patch "$PATCH_DIR/php-types-reference.patch" apply_patch "$PATCH_DIR/php-types-nullable-return.patch" apply_patch "$PATCH_DIR/php-types-cfg-reference.patch" apply_patch "$PATCH_DIR/php-types-nullable-optype-return.patch"