Skip to content

Commit

Permalink
Attempt to get working under PHP 8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelgbanks committed Aug 4, 2022
1 parent 277f48a commit e4e3421
Show file tree
Hide file tree
Showing 11 changed files with 4,367 additions and 3,112 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-2.x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["7.3", "7.4"]
php-versions: ["8.0", "8.1"]

name: PHP ${{ matrix.php-versions }}

Expand Down
5 changes: 2 additions & 3 deletions Homarus/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"description": "FFmpeg as a web service",
"type": "project",
"require": {
"php": "^7.3 || ^7.4",
"islandora/crayfish-commons": "^2"
},
"minimum-stability": "dev",
Expand Down Expand Up @@ -40,8 +39,8 @@
"sort-packages": true
},
"require-dev": {
"symfony/browser-kit": "^3.0",
"symfony/css-selector": "^3.0",
"symfony/browser-kit": "^4.4",
"symfony/css-selector": "^4.4",
"phpunit/phpunit": "^9.0",
"squizlabs/php_codesniffer": "^3.0",
"sebastian/phpcpd": "^6.0"
Expand Down
1,467 changes: 881 additions & 586 deletions Homarus/composer.lock

Large diffs are not rendered by default.

19 changes: 9 additions & 10 deletions Houdini/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,22 @@
}
],
"require": {
"php": "^7.3 || ^7.4",
"ext-ctype": "*",
"ext-iconv": "*",
"islandora/crayfish-commons": "dev-symfony-flex",
"symfony/console": "^4.3",
"symfony/dotenv": "^4.3",
"islandora/crayfish-commons": "dev-test-symfony-flex",
"symfony/console": "^4.4",
"symfony/dotenv": "^4.4",
"symfony/flex": "^1.17",
"symfony/framework-bundle": "^4.3",
"symfony/framework-bundle": "^4.4",
"symfony/monolog-bundle": "^3.4",
"symfony/web-server-bundle": "^4.3",
"symfony/yaml": "^4.3"
"symfony/web-server-bundle": "^4.4",
"symfony/yaml": "^4.4"
},
"require-dev": {
"symfony/var-dumper": "^4.3",
"symfony/var-dumper": "^4.4",
"squizlabs/php_codesniffer": "^3.0",
"sebastian/phpcpd": "^6.0",
"symfony/phpunit-bridge": "^4.3"
"symfony/phpunit-bridge": "^4.4"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down Expand Up @@ -89,7 +88,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "4.3.*"
"require": "^4.4"
}
}
}
Loading

0 comments on commit e4e3421

Please sign in to comment.