Skip to content

Commit 7d0f22f

Browse files
Merge branch '5.4' into 6.4
* 5.4: Port Appveyor to GitHub Actions normalize paths to avoid failures if a path is referenced by different names skip autocomplete test when stty is not available Bump Symfony version to 5.4.47 Update VERSION for 5.4.46 Update CONTRIBUTORS for 5.4.46 Update CHANGELOG for 5.4.46
2 parents 6e53b4d + 2c7c4ba commit 7d0f22f

File tree

5 files changed

+141
-74
lines changed

5 files changed

+141
-74
lines changed

.appveyor.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

.github/workflows/windows.yml

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
name: Windows
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
9+
cancel-in-progress: true
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
windows:
16+
name: x86 / minimal-exts / lowest-php
17+
18+
defaults:
19+
run:
20+
shell: pwsh
21+
22+
runs-on: windows-2022
23+
24+
env:
25+
COMPOSER_NO_INTERACTION: '1'
26+
SYMFONY_DEPRECATIONS_HELPER: 'strict'
27+
ANSICON: '121x90 (121x90)'
28+
SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE: '1'
29+
30+
steps:
31+
- name: Setup Git
32+
run: |
33+
git config --global core.autocrlf false
34+
git config --global user.email ""
35+
git config --global user.name "Symfony"
36+
37+
- name: Checkout
38+
uses: actions/checkout@v4
39+
with:
40+
fetch-depth: 2
41+
42+
- name: Setup PHP
43+
run: |
44+
$env:Path = 'c:\php;' + $env:Path
45+
mkdir c:\php && cd c:\php
46+
iwr -outf php-8.1.0-Win32-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.1.0-Win32-vs16-x86.zip
47+
7z x php-8.1.0-Win32-vs16-x86.zip -y >nul
48+
cd ext
49+
iwr -outf php_apcu-5.1.21-8.1-ts-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.21-8.1-ts-vs16-x86.zip
50+
7z x php_apcu-5.1.21-8.1-ts-vs16-x86.zip -y >nul
51+
iwr -outf php_redis-5.3.7-8.1-ts-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7-8.1-ts-vs16-x86.zip
52+
7z x php_redis-5.3.7-8.1-ts-vs16-x86.zip -y >nul
53+
cd ..
54+
Copy php.ini-development php.ini-min
55+
"memory_limit=-1" >> php.ini-min
56+
"serialize_precision=-1" >> php.ini-min
57+
"max_execution_time=1200" >> php.ini-min
58+
"post_max_size=2047M" >> php.ini-min
59+
"upload_max_filesize=2047M" >> php.ini-min
60+
"date.timezone=`"America/Los_Angeles`"" >> php.ini-min
61+
"extension_dir=ext" >> php.ini-min
62+
"extension=php_xsl.dll" >> php.ini-min
63+
"extension=php_mbstring.dll" >> php.ini-min
64+
Copy php.ini-min php.ini-max
65+
"zend_extension=php_opcache.dll" >> php.ini-max
66+
"opcache.enable_cli=1" >> php.ini-max
67+
"extension=php_openssl.dll" >> php.ini-max
68+
"extension=php_apcu.dll" >> php.ini-max
69+
"extension=php_redis.dll" >> php.ini-max
70+
"apc.enable_cli=1" >> php.ini-max
71+
"extension=php_intl.dll" >> php.ini-max
72+
"extension=php_fileinfo.dll" >> php.ini-max
73+
"extension=php_pdo_sqlite.dll" >> php.ini-max
74+
"extension=php_curl.dll" >> php.ini-max
75+
"extension=php_sodium.dll" >> php.ini-max
76+
Copy php.ini-max php.ini
77+
cd ${{ github.workspace }}
78+
iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar
79+
80+
- name: Install dependencies
81+
id: setup
82+
run: |
83+
$env:Path = 'c:\php;' + $env:Path
84+
mkdir $env:APPDATA\Composer && Copy .github\composer-config.json $env:APPDATA\Composer\config.json
85+
86+
$env:SYMFONY_VERSION=(Select-String -CaseSensitive -Pattern " VERSION =" -SimpleMatch -Path src/Symfony/Component/HttpKernel/Kernel.php | Select Line | Select-String -Pattern "([0-9][0-9]*\.[0-9])").Matches.Value
87+
$env:COMPOSER_ROOT_VERSION=$env:SYMFONY_VERSION + ".x-dev"
88+
89+
php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
90+
php composer.phar update --no-progress --ansi
91+
92+
- name: Install PHPUnit
93+
run: |
94+
$env:Path = 'c:\php;' + $env:Path
95+
96+
php phpunit install
97+
98+
- name: Install memurai-developer
99+
run: |
100+
choco install --no-progress memurai-developer
101+
102+
- name: Run tests (minimal extensions)
103+
if: always() && steps.setup.outcome == 'success'
104+
run: |
105+
$env:Path = 'c:\php;' + $env:Path
106+
$env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped'
107+
$x = 0
108+
109+
Copy c:\php\php.ini-min c:\php\php.ini
110+
Remove-Item -Path src\Symfony\Bridge\PhpUnit -Recurse
111+
mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
112+
php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
113+
php phpunit src\Symfony\Component\HttpClient || ($x = 1)
114+
115+
exit $x
116+
117+
- name: Run tests
118+
if: always() && steps.setup.outcome == 'success'
119+
run: |
120+
$env:Path = 'c:\php;' + $env:Path
121+
$env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped'
122+
$x = 0
123+
124+
Copy c:\php\php.ini-max c:\php\php.ini
125+
php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
126+
php phpunit src\Symfony\Component\HttpClient || ($x = 1)
127+
128+
exit $x

CONTRIBUTORS.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,7 @@ The Symfony Connect username in parenthesis allows to get more information
853853
- Robert-Jan de Dreu
854854
- Fabrice Bernhard (fabriceb)
855855
- Matthijs van den Bos (matthijs)
856+
- Markus S. (staabm)
856857
- Bhavinkumar Nakrani (bhavin4u)
857858
- Jaik Dean (jaikdean)
858859
- Krzysztof Piasecki (krzysztek)
@@ -946,6 +947,7 @@ The Symfony Connect username in parenthesis allows to get more information
946947
- Julien Boudry
947948
- vitaliytv
948949
- Franck RANAIVO-HARISOA (franckranaivo)
950+
- Yi-Jyun Pan
949951
- Egor Taranov
950952
- Andreas Hennings
951953
- Arnaud Frézet
@@ -1474,7 +1476,6 @@ The Symfony Connect username in parenthesis allows to get more information
14741476
- Marcos Gómez Vilches (markitosgv)
14751477
- Matthew Davis (mdavis1982)
14761478
- Paulo Ribeiro (paulo)
1477-
- Markus S. (staabm)
14781479
- Marc Laporte
14791480
- Michał Jusięga
14801481
- Kay Wei
@@ -1544,7 +1545,6 @@ The Symfony Connect username in parenthesis allows to get more information
15441545
- Mihail Krasilnikov (krasilnikovm)
15451546
- Uladzimir Tsykun
15461547
- iamvar
1547-
- Yi-Jyun Pan
15481548
- Amaury Leroux de Lens (amo__)
15491549
- Rene de Lima Barbosa (renedelima)
15501550
- Christian Jul Jensen
@@ -1615,6 +1615,7 @@ The Symfony Connect username in parenthesis allows to get more information
16151615
- ttomor
16161616
- Mei Gwilym (meigwilym)
16171617
- Michael H. Arieli
1618+
- Miloš Milutinović
16181619
- Jitendra Adhikari (adhocore)
16191620
- Nicolas Martin (cocorambo)
16201621
- Tom Panier (neemzy)
@@ -2941,6 +2942,7 @@ The Symfony Connect username in parenthesis allows to get more information
29412942
- Walther Lalk
29422943
- Adam
29432944
- Ivo
2945+
- vltrof
29442946
- Ismo Vuorinen
29452947
- Markus Staab
29462948
- Valentin
@@ -3588,10 +3590,12 @@ The Symfony Connect username in parenthesis allows to get more information
35883590
- Sean Templeton
35893591
- Willem Mouwen
35903592
- db306
3593+
- Dr. Gianluigi "Zane" Zanettini
35913594
- Michaël VEROUX
35923595
- Julia
35933596
- Lin Lu
35943597
- arduanov
3598+
- Valmonzo
35953599
- sualko
35963600
- Marc Bennewitz
35973601
- Fabien

src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,10 @@ public function testTraversableMultiselectAutocomplete()
908908

909909
public function testAutocompleteMoveCursorBackwards()
910910
{
911+
if (!Terminal::hasSttyAvailable()) {
912+
$this->markTestSkipped('`stty` is required to test autocomplete functionality');
913+
}
914+
911915
// F<TAB><BACKSPACE><BACKSPACE><BACKSPACE>
912916
$inputStream = $this->getInputStream("F\t\177\177\177");
913917

src/Symfony/Component/Process/Tests/ExecutableFinderTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,16 @@ public function testFindBatchExecutableOnWindows()
123123
$this->markTestSkipped('Can be only tested on windows');
124124
}
125125

126-
$target = str_replace('.tmp', '_tmp', tempnam(sys_get_temp_dir(), 'example-windows-executable'));
126+
$tempDir = realpath(sys_get_temp_dir());
127+
$target = str_replace('.tmp', '_tmp', tempnam($tempDir, 'example-windows-executable'));
127128

128129
try {
129130
touch($target);
130131
touch($target.'.BAT');
131132

132133
$this->assertFalse(is_executable($target));
133134

134-
putenv('PATH='.sys_get_temp_dir());
135+
putenv('PATH='.$tempDir);
135136

136137
$finder = new ExecutableFinder();
137138
$result = $finder->find(basename($target), false);

0 commit comments

Comments
 (0)