From 61415942c244a47e92464bfeef366f7220b6005d Mon Sep 17 00:00:00 2001 From: Daniel Scherzer Date: Tue, 29 Jul 2025 07:57:19 -0700 Subject: [PATCH] ext/standard: drop old smart_string headers (#19233) Functionality was removed in PHP 7.2 --- UPGRADING.INTERNALS | 4 ++++ ext/standard/php_smart_string.h | 19 ------------------- ext/standard/php_smart_string_public.h | 19 ------------------- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 ext/standard/php_smart_string.h delete mode 100644 ext/standard/php_smart_string_public.h diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 184f3a1ef1e..8c47bdda0d8 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -76,6 +76,10 @@ PHP 8.5 INTERNALS UPGRADE NOTES . zend_mm_refresh_key_child() must be called on any zend_mm_heap inherited from the parent process after a fork(). +- standard + . ext/standard/php_smart_string.h and ext/standard/php_smart_string_public.h + were removed. Use the corresponding headers in Zend/ instead. + ======================== 2. Build system changes ======================== diff --git a/ext/standard/php_smart_string.h b/ext/standard/php_smart_string.h deleted file mode 100644 index 0013775d18f..00000000000 --- a/ext/standard/php_smart_string.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | https://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Sascha Schumann | - | Xinchen Hui | - +----------------------------------------------------------------------+ - */ - -/* Header moved to Zend. This file is retained for BC. */ -#include "zend_smart_string.h" diff --git a/ext/standard/php_smart_string_public.h b/ext/standard/php_smart_string_public.h deleted file mode 100644 index 264723e28e1..00000000000 --- a/ext/standard/php_smart_string_public.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | https://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Sascha Schumann | - | Xinchen Hui | - +----------------------------------------------------------------------+ - */ - -/* Header moved to Zend. This file is retained for BC. */ -#include "zend_smart_string_public.h"