From cd2b0fa470403570eff648485499d1e7e20f5121 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Tue, 30 Jan 2024 13:54:14 -0500 Subject: [PATCH 1/8] allow later Symfony versions --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 46d7dda060..a6c5b9b945 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "matthiasmullie/scrapbook": "^1.4.7", "phpstan/phpstan": "^1.10.44", "mayflower/mo4-coding-standard": "^v9.0.0", - "symfony/yaml": "^5.1.7" + "symfony/yaml": "^5.4||^6.3||7.0" }, "suggest": { "doctrine/cache": "Can directly be used for caching purpose", From d57d06f503e5a01beea5724db32093aa53c92092 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Thu, 18 Jul 2024 23:23:16 +0200 Subject: [PATCH 2/8] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a6c5b9b945..4930439b1f 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "exclude-from-classmap": ["Tests/"] }, "require": { - "php": "^7.2|^8.0", + "php": "^7.2 || ^8.0", "mustangostang/spyc": "*" }, "require-dev": { @@ -33,7 +33,7 @@ "matthiasmullie/scrapbook": "^1.4.7", "phpstan/phpstan": "^1.10.44", "mayflower/mo4-coding-standard": "^v9.0.0", - "symfony/yaml": "^5.4||^6.3||7.0" + "symfony/yaml": "^5.1.7 || ^5.4 || ^6.3 || 7.0" }, "suggest": { "doctrine/cache": "Can directly be used for caching purpose", From 88cba36d8ff70725375fd4660e5a737c464b7eba Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 12 Jul 2024 15:42:10 +0200 Subject: [PATCH 3/8] Allow newer phpunit versions --- .gitignore | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fbf9f5df16..3640cfb77a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ composer.phar .buildpath .project .settings +.phpunit.result.cache diff --git a/composer.json b/composer.json index 4930439b1f..08f82a189c 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "mustangostang/spyc": "*" }, "require-dev": { - "phpunit/phpunit": "^8.5.8", + "phpunit/phpunit": "^8.5.8 || ^9 || ^10 || ^11", "psr/cache": "^1.0.1", "psr/simple-cache": "^1.0.1", "matthiasmullie/scrapbook": "^1.4.7", From 9e98fe050ed1daf207e8cc17d5f56eb4fd79936b Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Thu, 18 Jul 2024 23:27:49 +0200 Subject: [PATCH 4/8] Update phpunit.yml --- .github/workflows/phpunit.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 3829b4bd2a..9970b4a333 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -3,7 +3,7 @@ name: PHPUnit on: pull_request: push: - branches: [ master ] + branches: [master] permissions: actions: read @@ -46,8 +46,8 @@ jobs: extensions: memcached - name: "Composer install" run: | - composer install --ignore-platform-reqs - composer require doctrine/cache ~1.2 --ignore-platform-reqs + composer install + composer require doctrine/cache ~1.2 - name: PHPUnit / PHP ${{ matrix.php-version }} run: | php -v @@ -59,7 +59,7 @@ jobs: strategy: matrix: operating-system: [macOS-latest] - php-version: [ '7.2', '8.3' ] + php-version: ['7.2', '8.3'] steps: - uses: actions/checkout@v2 - name: Install PHP @@ -70,8 +70,8 @@ jobs: extensions: memcached - name: "Composer install" run: | - composer install --ignore-platform-reqs - composer require doctrine/cache ~1.2 --ignore-platform-reqs + composer install + composer require doctrine/cache ~1.2 - name: PHPUnit / PHP ${{ matrix.php-version }} run: | php -v From 7d6fcab6f4e8b5b26f4728b55aa9edca080da5b9 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Thu, 18 Jul 2024 23:29:05 +0200 Subject: [PATCH 5/8] Update phpcs.yml --- .github/workflows/phpcs.yml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index f4d2625406..4828d3a2b0 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -1,4 +1,4 @@ -name: PHPCS check +name: PHPCS permissions: actions: read @@ -15,20 +15,27 @@ permissions: on: pull_request: push: - branches: [ master ] + branches: [master] jobs: phpcs: name: PHPCS - runs-on: ubuntu-latest + runs-on: ${{ matrix.operating-system }} + strategy: + matrix: + operating-system: [ubuntu-latest] + php-version: ['7.2'] steps: - uses: actions/checkout@v2 - - name: Install dependencies - run: composer install --dev --prefer-dist --no-progress --no-suggest --ignore-platform-reqs - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.2' - tools: cs2pr - - name: Run phpcs - run: ./vendor/bin/phpcs -q --report=checkstyle | cs2pr + php-version: ${{ matrix.php-version }} + tools: composer:v2, cs2pr + - name: "Composer install" + run: | + composer install --dev --prefer-dist --no-progress --no-suggest + - name: PHPCS / PHP ${{ matrix.php-version }} + run: | + php -v + ./vendor/bin/phpcs -q --report=checkstyle | cs2pr From e018f723535dd9b9a20ed02d98ddd5a78fc6f11c Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Fri, 13 Sep 2024 13:45:46 +0200 Subject: [PATCH 6/8] Bump actions version to remove deprecated warnings --- .github/workflows/phpcs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index 4828d3a2b0..f659466208 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -26,7 +26,7 @@ jobs: operating-system: [ubuntu-latest] php-version: ['7.2'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: From 2515e64df6b0422b115b9848aedaa2ff30473ebc Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Fri, 20 Dec 2024 22:39:36 +0100 Subject: [PATCH 7/8] Update composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 08f82a189c..d4ee3873a7 100644 --- a/composer.json +++ b/composer.json @@ -28,12 +28,12 @@ }, "require-dev": { "phpunit/phpunit": "^8.5.8 || ^9 || ^10 || ^11", - "psr/cache": "^1.0.1", - "psr/simple-cache": "^1.0.1", + "psr/cache": "^1.0.1 || ^2.0 || ^3.0", + "psr/simple-cache": "^1.0.1 || ^2.0 || ^3.0", "matthiasmullie/scrapbook": "^1.4.7", "phpstan/phpstan": "^1.10.44", "mayflower/mo4-coding-standard": "^v9.0.0", - "symfony/yaml": "^5.1.7 || ^5.4 || ^6.3 || 7.0" + "symfony/yaml": "^5.1.7 || ^5.4 || ^6.3 || ^7.0" }, "suggest": { "doctrine/cache": "Can directly be used for caching purpose", From 5909ac58b56151ca2b771f0459b3043ba84fa207 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Fri, 20 Dec 2024 22:45:46 +0100 Subject: [PATCH 8/8] Update phpcs.yml --- .github/workflows/phpcs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml index f659466208..ec9de46285 100644 --- a/.github/workflows/phpcs.yml +++ b/.github/workflows/phpcs.yml @@ -20,14 +20,14 @@ on: jobs: phpcs: name: PHPCS - runs-on: ${{ matrix.operating-system }} + runs-on: ${{ matrix.os }} strategy: matrix: - operating-system: [ubuntu-latest] + os: [ubuntu-latest] php-version: ['7.2'] steps: - uses: actions/checkout@v4 - - name: Setup PHP + - name: Install PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-version }}