Skip to content

[pull] master from php:master #614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 16, 2025
Merged

[pull] master from php:master #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7bc14d
Prevent using system DLLs when running the tests
cmb69 Feb 14, 2025
7a734ca
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Feb 16, 2025
08ace84
Merge branch 'PHP-8.4'
cmb69 Feb 16, 2025
765cebf
Adapt tests to Windows 11
cmb69 Feb 11, 2025
8a6370d
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Feb 16, 2025
6ccb35e
Merge branch 'PHP-8.4'
cmb69 Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/scripts/windows/build_task.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ if /i "%GITHUB_ACTIONS%" neq "True" (
exit /b 3
)

del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
if %errorlevel% neq 0 exit /b 3
del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
if %errorlevel% neq 0 exit /b 3

call %~dp0find-target-branch.bat
set STABILITY=staging
set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%
Expand Down
2 changes: 2 additions & 0 deletions .github/scripts/windows/test_task.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ editbin /stack:8388608 %PHP_BUILD_DIR%\php-cgi.exe

set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe

copy /-y %DEPS_DIR%\bin\*.dll %PHP_BUILD_DIR%\*

if "%ASAN%" equ "1" set ASAN_OPTS=--asan

mkdir c:\tests_tmp
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/file/rename_variation-win32.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ bool(false)
bool(true)
-- Iteration 2 --

Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): The filename, directory name, or volume label syntax is incorrect (code: 123) in %s on line %d
Warning: rename(%s/rename_variation-win32/rename_variation.tmp/,%s/rename_variation2.tmp): %rThe filename, directory name, or volume label syntax is incorrect|The directory name is invalid%r (code: %r123|267%r) in %s on line %d
bool(false)
bool(false)
bool(false)
Expand Down
4 changes: 2 additions & 2 deletions ext/standard/tests/file/unlink_variation8-win32.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ file removed
Warning: unlink(%s/BADDIR/file.tmp): No such file or directory in %s on line %d
-- removing unlinkVar8.tmp/file.tmp/ --

Warning: unlink(unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d
Warning: unlink(unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
-- removing %s/unlinkVar8.tmp/file.tmp/ --

Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): No such file or directory in %s on line %d
Warning: unlink(%s/unlinkVar8.tmp/file.tmp/): %rNo such file or directory|Not a directory%r in %s on line %d
-- removing unlinkVar8.tmp//file.tmp --
file removed
-- removing %s//unlinkVar8.tmp//file.tmp --
Expand Down
4 changes: 2 additions & 2 deletions ext/standard/tests/file/unlink_variation9-win32.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ file removed
Warning: unlink(%s\BADDIR\file.tmp): No such file or directory in %s on line %d
-- removing unlinkVar9.tmp\file.tmp\ --

Warning: unlink(unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d
Warning: unlink(unlinkVar9.tmp\file.tmp\): %rNo such file or directory|Not a directory%r in %s on line %d
-- removing %s\unlinkVar9.tmp\file.tmp\ --

Warning: unlink(%s\unlinkVar9.tmp\file.tmp\): No such file or directory in %s on line %d
Warning: unlink(%s\unlinkVar9.tmp\file.tmp\): %rNo such file or directory|Not a directory%r in %s on line %d
-- removing unlinkVar9.tmp\\file.tmp --
file removed
-- removing %s\\unlinkVar9.tmp\\file.tmp --
Expand Down
Loading