From 5f735e2fc0a3e42595c7c49264a5f89cc5918c24 Mon Sep 17 00:00:00 2001 From: tianfenghan Date: Tue, 14 Jul 2026 14:23:14 +0800 Subject: [PATCH] Shorten multi-return helper namespace --- phpunit/src/MultiReturnTest.php | 6 +++--- src/CompilerBase.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpunit/src/MultiReturnTest.php b/phpunit/src/MultiReturnTest.php index 49ac4104..0a4bd13d 100644 --- a/phpunit/src/MultiReturnTest.php +++ b/phpunit/src/MultiReturnTest.php @@ -17,11 +17,11 @@ final class MultiReturnTest extends TestCase $code = file_get_contents($cppFile); $this->assertStringContainsString( - 'std::tuple typephp::detail::multi_return::php_phpunit_multi_values()', + 'std::tuple typephp::detail::php_phpunit_multi_values()', $code, ); $this->assertStringContainsString( - 'std::tie(first, second) = typephp::detail::multi_return::php_phpunit_multi_values()', + 'std::tie(first, second) = typephp::detail::php_phpunit_multi_values()', $code, ); $this->assertStringContainsString( @@ -33,7 +33,7 @@ final class MultiReturnTest extends TestCase $code, ); $this->assertStringNotContainsString( - 'typephp::detail::multi_return::php_phpunit_multi_side_effect', + 'typephp::detail::php_phpunit_multi_side_effect', $code, ); } diff --git a/src/CompilerBase.php b/src/CompilerBase.php index 037d62e4..d10b6ffa 100644 --- a/src/CompilerBase.php +++ b/src/CompilerBase.php @@ -197,7 +197,7 @@ class CompilerBase implements PropertyAccessContext public const string NAMESPACE_SEPARATOR = '__'; public const string PREFIX = 'php_'; - protected const string MULTI_RETURN_NAMESPACE = 'typephp::detail::multi_return'; + protected const string MULTI_RETURN_NAMESPACE = 'typephp::detail'; public const string OP_ISSET = 'isset'; public const string OP_EMPTY = 'empty'; public const string OP_NOT_EMPTY = 'notEmpty';