updated streamline-setup v2

This commit is contained in:
2025-01-15 08:53:49 -08:00
committed by alec.turner
parent a2ce9248f0
commit 4b569f81b0
20228 changed files with 2932048 additions and 63204 deletions
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
- name: Validate composer.json
@@ -19,7 +19,7 @@ jobs:
name: PHP-CS-Fixer
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
@@ -32,9 +32,12 @@ jobs:
fail-fast: false
matrix:
include:
- description: 'Symfony 7.1 DEV'
- description: 'Symfony 7.2 DEV'
php: '8.2'
symfony: '7.1.*@dev'
symfony: '7.2.*@dev'
- description: 'Symfony 7.0'
php: '8.4'
symfony: '7.0.*'
- description: 'Symfony 7.0'
php: '8.3'
symfony: '7.0.*'
@@ -56,9 +59,9 @@ jobs:
name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.composer/cache/files
key: composer-${{ matrix.php }}-${{ matrix.symfony }}-${{ matrix.composer_option }}
@@ -74,7 +77,7 @@ jobs:
composer config prefer-stable true
if: matrix.beta
- name: remove cs-fixer for Symfony 7 (temporary as not-supported yet)
if: contains(matrix.symfony, '7.1.*@dev') || contains(matrix.symfony, '7.0.*')
if: contains(matrix.symfony, '7.2.*@dev') || contains(matrix.symfony, '7.0.*')
run: |
composer remove --dev friendsofphp/php-cs-fixer pedrotroller/php-cs-custom-fixer --no-update
- run: composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
@@ -86,9 +89,12 @@ jobs:
fail-fast: false
matrix:
include:
- description: 'Symfony 7.1 DEV'
- description: 'Symfony 7.2 DEV'
php: '8.2'
symfony: '7.1.*@dev'
symfony: '7.2.*@dev'
- description: 'Symfony 7.0'
php: '8.4'
symfony: '7.0.*'
- description: 'Symfony 7.0'
php: '8.3'
symfony: '7.0.*'
@@ -101,9 +107,9 @@ jobs:
name: "[WINDOWS] PHP ${{ matrix.php }} tests (${{ matrix.description }})"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.composer/cache/files
key: composer-${{ matrix.php }}-${{ matrix.symfony }}-${{ matrix.composer_option }}
@@ -119,7 +125,7 @@ jobs:
composer config prefer-stable true
if: matrix.beta
- name: remove cs-fixer for Symfony 7 (temporary as not-supported yet)
if: contains(matrix.symfony, '7.1.*@dev') || contains(matrix.symfony, '7.0.*')
if: contains(matrix.symfony, '7.2.*@dev') || contains(matrix.symfony, '7.0.*')
run: |
composer remove --dev friendsofphp/php-cs-fixer pedrotroller/php-cs-custom-fixer --no-update
- run: composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_option }}
@@ -65,7 +65,7 @@ abstract class AbstractGenerator implements GeneratorInterface, LoggerAwareInter
* @param array $options
* @param null|array $env
*/
public function __construct($binary, array $options = [], array $env = null)
public function __construct($binary, array $options = [], array|null $env = null)
{
$this->configure();
@@ -13,7 +13,7 @@ class Image extends AbstractGenerator
/**
* {@inheritdoc}
*/
public function __construct($binary = null, array $options = [], array $env = null)
public function __construct($binary = null, array $options = [], array|null $env = null)
{
$this->setDefaultExtension('jpg');
@@ -18,7 +18,7 @@ class Pdf extends AbstractGenerator
/**
* {@inheritdoc}
*/
public function __construct($binary = null, array $options = [], array $env = null)
public function __construct($binary = null, array $options = [], array|null $env = null)
{
$this->setDefaultExtension('pdf');
$this->setOptionsWithContentCheck();