Skip to content

Commit

Permalink
Merge pull request #26 from AaronGilMartinez/OEL-3318
Browse files Browse the repository at this point in the history
Support for consolidation/robo:5.x
  • Loading branch information
ademarco authored Oct 3, 2024
2 parents 4093787 + d7c5b5b commit 9e25f40
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
PHP_VERSION: [ "8.0", "8.1" ]
ROBO_VERSION: [ "4.0", "5.0" ]
PHP_VERSION: [ "8.2", "8.3" ]
include:
- ROBO_VERSION: "4.0"
PHP_VERSION: "8.0"
- ROBO_VERSION: "4.0"
PHP_VERSION: "8.1"

steps:
- uses: actions/checkout@v2
- uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php_version }}
command: "require consolidation/robo:~${{ matrix.ROBO_VERSION }}"
php_version: ${{ matrix.PHP_VERSION }}
version: 2
- uses: php-actions/phpunit@v3
with:
test_suffix: FALSE
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
}
],
"require": {
"consolidation/robo": "^4.0"
"consolidation/robo": "^4.0 || ^5.0"
},
"require-dev": {
"drupal/coder": "^8.3.16",
"phpunit/phpunit": "^9.5.5",
"phpro/grumphp": "^1.14"
"phpro/grumphp": "^1.14 || ^2.3"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions tests/TaskTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function testProcess($config_file, $source_file, $processed_file) {
* @return array
* Test data.
*/
public function appendTestProvider() {
public static function appendTestProvider() {
return [
['1-config.yml', '1-input.php', '1-output-append.php'],
['2-config.yml', '2-input.php', '2-output-append.php'],
Expand All @@ -159,7 +159,7 @@ public function appendTestProvider() {
* @return array
* Test data.
*/
public function prependTestProvider() {
public static function prependTestProvider() {
return [
['1-config.yml', '1-input.php', '1-output-prepend.php'],
['2-config.yml', '2-input.php', '2-output-prepend.php'],
Expand All @@ -172,7 +172,7 @@ public function prependTestProvider() {
* @return array
* Test data.
*/
public function writeTestProvider() {
public static function writeTestProvider() {
return [
['3-config.yml', '3-output-write.php'],
];
Expand Down

0 comments on commit 9e25f40

Please sign in to comment.