Skip to content

Commit

Permalink
Attempt to get working under PHP 8.0 and 8.1 (#161)
Browse files Browse the repository at this point in the history
* Attempt to get working under PHP 8.1
- Removed lock file
- Updated test matrix
- Fixed tests to work on php 7.4, 8.0, 8.1

For reasons behind removing the lock file see:
https://islandora.slack.com/archives/CM5PPAV28/p1659631615201049
Islandora/documentation#1908 (Removal approved)

Instead we'll provide lock files in isle and ansible deployments.

Additionally moving to drop tests for 7.3 as it is no longer supported
by Drupal 9.4 and up.

* Removed debug code
  • Loading branch information
nigelgbanks authored Dec 15, 2022
1 parent 4dca22a commit d4bc375
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 33,467 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: ["7.4"]

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-3.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: ["7.4", "8.0", "8.1"]

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

Expand Down
16 changes: 9 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
vendor
config/settings.dev.yml
config/settings.yml
coverage.xml
.idea
.php_cs.cache
.phpunit
.phpunit.result.cache
*.key
*.lock
*.log
syn-settings.xml
*/cfg/config.yaml
clover.xml
.php_cs.cache
.phpunit.result.cache
config/settings.dev.yml
config/settings.yml
coverage.xml
syn-settings.xml
vendor
2 changes: 1 addition & 1 deletion .scripts/tester
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

export SYMFONY_DEPRECATIONS_HELPER=disabled
FAIL=0
for D in */; do
cd $D
Expand Down
1 change: 0 additions & 1 deletion Homarus/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"type": "project",
"license": "MIT",
"require": {
"php": "^7.3 || ^7.4",
"ext-ctype": "*",
"ext-iconv": "*",
"islandora/crayfish-commons": "^3.0",
Expand Down
Loading

0 comments on commit d4bc375

Please sign in to comment.