Skip to content

Commit

Permalink
Support PHP 8.3 (#4189)
Browse files Browse the repository at this point in the history
  • Loading branch information
paul-m authored Jun 21, 2024
1 parent 33c8ca0 commit 1176540
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 41 deletions.
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,17 @@ workflows:
name: install_test_cypress
dkan_recommended_branch: '10.2.x-dev'
- phpunit:
name: 'Install target (Drupal 10.2, PHP 8.2)'
name: 'Install target (Drupal 10.2, PHP 8.3)'
report_coverage: true
matrix:
parameters:
dkan_recommended_branch: [ '10.2.x-dev']
php_version: [ '8.2' ]
php_version: [ '8.3' ]
- phpunit:
matrix:
parameters:
dkan_recommended_branch: [ '10.2.x-dev']
php_version: [ '8.1', '8.2' ]
- phpunit:
matrix:
parameters:
Expand All @@ -248,11 +253,6 @@ workflows:
parameters:
dkan_recommended_branch: [ '10.0.x-dev']
php_version: [ '8.1' ]
- phpunit:
matrix:
parameters:
dkan_recommended_branch: [ '10.2.x-dev']
php_version: [ '8.1' ]
upgrade_and_test:
jobs:
- cypress:
Expand Down
68 changes: 34 additions & 34 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,47 @@
{
"name": "getdkan/dkan",
"type": "drupal-module",
"license": "GPL-2.0-or-later",
"minimum-stability": "dev",
"description": "DKAN Open Data Catalog",
"license": "GPL-2.0-or-later",
"type": "drupal-module",
"authors": [
{
"name": "CivicActions",
"email": "contact@civicactions.com"
}
],
"require": {
"ext-json": "*",
"drupal/facets": "^3.0@beta",
"drupal/moderated_content_bulk_publish": "~2.0.20",
"drupal/search_api": "^1.15",
"drupal/select_or_other": "^4.1.0",
"drupal/select2": "^1.13",
"drupal/select_or_other": "^4.1.0",
"drupal/views_bulk_operations": "^4.0",
"ext-json": "*",
"ezyang/htmlpurifier" : "^4.11",
"ezyang/htmlpurifier": "^4.11",
"fmizzell/maquina": "^1.1.1",
"getdkan/contracts": "^1.1.2",
"getdkan/csv-parser": "^1.3.1",
"getdkan/file-fetcher" : "^5.0.3",
"getdkan/harvest": "^1.0.3",
"getdkan/procrastinator": "^5.0.0",
"getdkan/rooted-json-data": "^0.2.1",
"guzzlehttp/guzzle" : "^6.5.8 || ^7.4.5",
"fylax/forceutf8": "^3.0",
"getdkan/contracts": "^1.1.3",
"getdkan/csv-parser": "^1.3.2",
"getdkan/file-fetcher": "^5.0.4",
"getdkan/harvest": "^1.0.4",
"getdkan/pdlt": "^0.1.7",
"getdkan/procrastinator": "^5.0.2",
"getdkan/rooted-json-data": "^0.2.2",
"guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
"ilbee/csv-response": "^1.2.0",
"justinrainbow/json-schema": "^5.2",
"m1x0n/opis-json-schema-error-presenter": "^0.5.3",
"fylax/forceutf8": "~3.0",
"npm-asset/select2": "^4.0",
"oomphinc/composer-installers-extender": "^2.0",
"ramsey/uuid" : "^3.8.0",
"ramsey/uuid": "^3.8.0",
"stolt/json-merge-patch": "^2.0",
"getdkan/pdlt": "~0.1",
"symfony/polyfill-php80": "^1.27"
},
"require-dev": {
"drush/drush": "^12@stable",
"getdkan/mock-chain": "^1.3.6",
"weitzman/drupal-test-traits": "^2.0.1",
"phpunit/phpunit": "^8.5.14 || ^9"
"getdkan/mock-chain": "^1.3.7",
"phpunit/phpunit": "^8.5.14 || ^9",
"weitzman/drupal-test-traits": "^2.0.1"
},
"repositories": {
"drupal": {
Expand All @@ -48,29 +53,24 @@
"url": "https://asset-packagist.org"
}
},
"authors": [
{
"name": "CivicActions",
"email": "contact@civicactions.com"
"minimum-stability": "dev",
"config": {
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"oomphinc/composer-installers-extender": true
}
],
},
"extra": {
"dkan-frontend": {
"ref": "1.3.0",
"type": "vcs",
"url": "https://github.com/GetDKAN/data-catalog-app",
"ref": "1.3.0"
"url": "https://github.com/GetDKAN/data-catalog-app"
},
"installer-types": [
"bower-asset",
"npm-asset"
]
},
"discard-changes": true,
"config": {
"allow-plugins": {
"composer/installers": true,
"cweagans/composer-patches": true,
"oomphinc/composer-installers-extender": true
}
}
"discard-changes": true
}

0 comments on commit 1176540

Please sign in to comment.