Skip to content

Commit

Permalink
CLI-1172: Drop support for PHP 8.0 (#1615)
Browse files Browse the repository at this point in the history
* CLI-1172: Drop support for PHP 8.0

* update ci
  • Loading branch information
danepowell authored Oct 30, 2023
1 parent 01efb0f commit 45b30b9
Show file tree
Hide file tree
Showing 6 changed files with 639 additions and 812 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-22.04"]
php: ["8.0", "8.1", "8.2"]
php: ["8.1", "8.2"]
coverage: ["none"]
include:
- os: "ubuntu-22.04"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
tools: composer:v2
coverage: pcov

Expand Down
312 changes: 0 additions & 312 deletions assets/symfony-console-rst.patch

This file was deleted.

23 changes: 19 additions & 4 deletions assets/symfony-fs-mirror.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
From c5aaa3a3a6c83049dc31782a0cdfb6eba0151a6e Mon Sep 17 00:00:00 2001
From: Dane Powell <[email protected]>
Date: Fri, 27 Oct 2023 10:42:00 -0700
Subject: [PATCH] Fix #14068: [Filesystem] mirror() does not work correctly
with custom iterators

---
src/Symfony/Component/Filesystem/Filesystem.php | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index 3498e7f9fb..4d68341136 100644
index 78458d5b91..20639b1a29 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -497,16 +497,17 @@ class Filesystem
@@ -519,18 +519,19 @@ class Filesystem
* - existing files in the target directory will be overwritten, except if they are newer (see the `override` option)
* - files in the target directory that do not exist in the source directory will not be deleted (see the `delete` option)
*
Expand All @@ -14,6 +24,8 @@ index 3498e7f9fb..4d68341136 100644
* - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink(), defaults to false)
* - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
+ * @param \Traversable|null $targetIterator Iterator that filters which files and directory in target directory to delete if not in source directory (if $options['delete'] is true)
*
* @return void
*
* @throws IOException When file type is unknown
*/
Expand All @@ -22,7 +34,7 @@ index 3498e7f9fb..4d68341136 100644
{
$targetDir = rtrim($targetDir, '/\\');
$originDir = rtrim($originDir, '/\\');
@@ -518,7 +519,7 @@ class Filesystem
@@ -542,7 +543,7 @@ class Filesystem

// Iterate in destination folder to remove obsolete entries
if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {
Expand All @@ -31,7 +43,7 @@ index 3498e7f9fb..4d68341136 100644
if (null === $deleteIterator) {
$flags = \FilesystemIterator::SKIP_DOTS;
$deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);
@@ -534,15 +535,15 @@ class Filesystem
@@ -558,15 +559,15 @@ class Filesystem

$copyOnWindows = $options['copy_on_windows'] ?? false;

Expand All @@ -50,3 +62,6 @@ index 3498e7f9fb..4d68341136 100644
if ($file->getPathname() === $targetDir || $file->getRealPath() === $targetDir || isset($filesCreatedWhileMirroring[$file->getRealPath()])) {
continue;
}
--
2.42.0

Loading

0 comments on commit 45b30b9

Please sign in to comment.