From 8422224091e86cde84d82726e527c3bdba9b04a7 Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Sat, 3 Jan 2026 18:40:57 +0100
Subject: [PATCH] Update NEWS and UPGRADING with addition of JSON error
 locations

---
 NEWS      | 4 ++++
 UPGRADING | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index dd5e42452a2..5044ac4f1a9 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-20426 (Spoofchecker::setRestrictionLevel() error message
     suggests missing constants). (DanielEScherzer)
 
+- JSON:
+  . Enriched JSON last error / exception message with error location.
+    (Juan Morales)
+
 - Fibers:
   . Fixed bug GH-20483 (ASAN stack overflow with fiber.stack_size INI
     small value). (David Carlier)
diff --git a/UPGRADING b/UPGRADING
index 0ea423b32d3..338a3e5179a 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -40,6 +40,10 @@ PHP 8.6 UPGRADE NOTES
     IntlNumberRangeFormatter::IDENTITY_FALLBACK_RANGE identity fallbacks.
     It is supported from icu 63.
 
+- JSON:
+  . Added extra info about error location to the JSON error messages returned
+    from json_last_error_msg() and JsonException message.
+
 - Phar:
   . Overriding the getMTime() and getPathname() methods of SplFileInfo now
     influences the result of the phar buildFrom family of functions.