Merge branch '6.4' into 7.1

nicolas-grekas · nicolas-grekas · commit 3356b21df3fa · 2024-11-06T15:23:19.000+01:00
* 6.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 6.4.15
  Update VERSION for 6.4.14
  Update CHANGELOG for 6.4.14
  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
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -0,0 +1,129 @@
+name: Windows
+
+on:
+  push:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  windows:
+    name: x86 / minimal-exts / lowest-php
+
+    defaults:
+      run:
+        shell: pwsh
+
+    runs-on: windows-2022
+
+    env:
+      COMPOSER_NO_INTERACTION: '1'
+      SYMFONY_DEPRECATIONS_HELPER: 'strict'
+      ANSICON: '121x90 (121x90)'
+      SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE: '1'
+
+    steps:
+      - name: Setup Git
+        run: |
+          git config --global core.autocrlf false
+          git config --global user.email ""
+          git config --global user.name "Symfony"
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup PHP
+        run: |
+          $env:Path = 'c:\php;' + $env:Path
+          mkdir c:\php && cd c:\php
+          iwr -outf php-8.2.0-Win32-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-Win32-vs16-x86.zip
+          7z x php-8.2.0-Win32-vs16-x86.zip -y >nul
+          cd ext
+          iwr -outf php_apcu-5.1.22-8.2-ts-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.22-8.2-ts-vs16-x86.zip
+          7z x php_apcu-5.1.22-8.2-ts-vs16-x86.zip -y >nul
+          iwr -outf php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip
+          7z x php_redis-6.0.0-dev-8.2-ts-vs16-x86.zip -y >nul
+          cd ..
+          Copy php.ini-development php.ini-min
+          "memory_limit=-1" >> php.ini-min
+          "serialize_precision=-1" >> php.ini-min
+          "max_execution_time=1200" >> php.ini-min
+          "post_max_size=2047M" >> php.ini-min
+          "upload_max_filesize=2047M" >> php.ini-min
+          "date.timezone=`"America/Los_Angeles`"" >> php.ini-min
+          "extension_dir=ext" >> php.ini-min
+          "extension=php_xsl.dll" >> php.ini-min
+          "extension=php_mbstring.dll" >> php.ini-min
+          Copy php.ini-min php.ini-max
+          "zend_extension=php_opcache.dll" >> php.ini-max
+          "opcache.enable_cli=1" >> php.ini-max
+          "extension=php_openssl.dll" >> php.ini-max
+          "extension=php_apcu.dll" >> php.ini-max
+          "extension=php_igbinary.dll" >> php.ini-max
+          "extension=php_redis.dll" >> php.ini-max
+          "apc.enable_cli=1" >> php.ini-max
+          "extension=php_intl.dll" >> php.ini-max
+          "extension=php_fileinfo.dll" >> php.ini-max
+          "extension=php_pdo_sqlite.dll" >> php.ini-max
+          "extension=php_curl.dll" >> php.ini-max
+          "extension=php_sodium.dll" >> php.ini-max
+          Copy php.ini-max php.ini
+          cd ${{ github.workspace }}
+          iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar
+
+      - name: Install dependencies
+        id: setup
+        run: |
+          $env:Path = 'c:\php;' + $env:Path
+          mkdir $env:APPDATA\Composer && Copy .github\composer-config.json $env:APPDATA\Composer\config.json
+
+          $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
+          $env:COMPOSER_ROOT_VERSION=$env:SYMFONY_VERSION + ".x-dev"
+
+          php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
+          php composer.phar update --no-progress --ansi
+
+      - name: Install PHPUnit
+        run: |
+          $env:Path = 'c:\php;' + $env:Path
+
+          php phpunit install
+
+      - name: Install memurai-developer
+        run: |
+          choco install --no-progress memurai-developer
+
+      - name: Run tests (minimal extensions)
+        if: always() && steps.setup.outcome == 'success'
+        run: |
+          $env:Path = 'c:\php;' + $env:Path
+          $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped'
+          $x = 0
+
+          Copy c:\php\php.ini-min c:\php\php.ini
+          Remove-Item -Path src\Symfony\Bridge\PhpUnit -Recurse
+          mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
+          php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
+          php phpunit src\Symfony\Component\HttpClient || ($x = 1)
+
+          exit $x
+
+      - name: Run tests
+        if: always() && steps.setup.outcome == 'success'
+        run: |
+          $env:Path = 'c:\php;' + $env:Path
+          $env:SYMFONY_PHPUNIT_SKIPPED_TESTS = 'phpunit.skipped'
+          $x = 0
+
+          Copy c:\php\php.ini-max c:\php\php.ini
+          php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
+          php phpunit src\Symfony\Component\HttpClient || ($x = 1)
+
+          exit $x
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -853,6 +853,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Robert-Jan de Dreu
  - Fabrice Bernhard (fabriceb)
  - Matthijs van den Bos (matthijs)
+ - Markus S. (staabm)
  - Bhavinkumar Nakrani (bhavin4u)
  - Jaik Dean (jaikdean)
  - Krzysztof Piasecki (krzysztek)
@@ -946,6 +947,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Julien Boudry
  - vitaliytv
  - Franck RANAIVO-HARISOA (franckranaivo)
+ - Yi-Jyun Pan
  - Egor Taranov
  - Andreas Hennings
  - Arnaud Frézet
@@ -1474,7 +1476,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Marcos Gómez Vilches (markitosgv)
  - Matthew Davis (mdavis1982)
  - Paulo Ribeiro (paulo)
- - Markus S. (staabm)
  - Marc Laporte
  - Michał Jusięga
  - Kay Wei
@@ -1544,7 +1545,6 @@ The Symfony Connect username in parenthesis allows to get more information
  - Mihail Krasilnikov (krasilnikovm)
  - Uladzimir Tsykun
  - iamvar
- - Yi-Jyun Pan
  - Amaury Leroux de Lens (amo__)
  - Rene de Lima Barbosa (renedelima)
  - Christian Jul Jensen
@@ -1615,6 +1615,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - ttomor
  - Mei Gwilym (meigwilym)
  - Michael H. Arieli
+ - Miloš Milutinović
  - Jitendra Adhikari (adhocore)
  - Nicolas Martin (cocorambo)
  - Tom Panier (neemzy)
@@ -2941,6 +2942,7 @@ The Symfony Connect username in parenthesis allows to get more information
  - Walther Lalk
  - Adam
  - Ivo
+ - vltrof
  - Ismo Vuorinen
  - Markus Staab
  - Valentin
@@ -3588,10 +3590,12 @@ The Symfony Connect username in parenthesis allows to get more information
  - Sean Templeton
  - Willem Mouwen
  - db306
+ - Dr. Gianluigi &quot;Zane&quot; Zanettini
  - Michaël VEROUX
  - Julia
  - Lin Lu
  - arduanov
+ - Valmonzo
  - sualko
  - Marc Bennewitz
  - Fabien
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -908,6 +908,10 @@ public function testTraversableMultiselectAutocomplete()
 
     public function testAutocompleteMoveCursorBackwards()
     {
+        if (!Terminal::hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
         // F<TAB><BACKSPACE><BACKSPACE><BACKSPACE>
         $inputStream = $this->getInputStream("F\t\177\177\177");
 
diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php
@@ -123,15 +123,16 @@ public function testFindBatchExecutableOnWindows()
             $this->markTestSkipped('Can be only tested on windows');
         }
 
-        $target = str_replace('.tmp', '_tmp', tempnam(sys_get_temp_dir(), 'example-windows-executable'));
+        $tempDir = realpath(sys_get_temp_dir());
+        $target = str_replace('.tmp', '_tmp', tempnam($tempDir, 'example-windows-executable'));
 
         try {
             touch($target);
             touch($target.'.BAT');
 
             $this->assertFalse(is_executable($target));
 
-            putenv('PATH='.sys_get_temp_dir());
+            putenv('PATH='.$tempDir);
 
             $finder = new ExecutableFinder();
             $result = $finder->find(basename($target), false);

Original file line number	Diff line number	Diff line change
`@@ -908,6 +908,10 @@ public function testTraversableMultiselectAutocomplete()`
`908`	`908`
`909`	`909`	`public function testAutocompleteMoveCursorBackwards()`
`910`	`910`	`{`
	`911`	`+ if (!Terminal::hasSttyAvailable()) {`
	`912`	+ $this->markTestSkipped('`stty` is required to test autocomplete functionality');
	`913`	`+ }`
	`914`	`+`
`911`	`915`	`// F<TAB><BACKSPACE><BACKSPACE><BACKSPACE>`
`912`	`916`	`$inputStream = $this->getInputStream("F\t\177\177\177");`
`913`	`917`