diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 132f08e..18d1f53 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.3' ] dependency-version: [ prefer-lowest, prefer-stable ] steps: - uses: actions/checkout@master @@ -55,7 +55,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ '8.1' ] + php-versions: [ '8.3' ] steps: - uses: actions/checkout@master - name: Setup PHP, with composer and extensions diff --git a/README.md b/README.md index 2280234..ebf5236 100644 --- a/README.md +++ b/README.md @@ -108,11 +108,11 @@ run the checks locally. ### PHP ```shell -docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm composer install +docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm composer install # Fix (some) coding standards issues -docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm composer coding-standards-apply +docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm composer coding-standards-apply # Check that code adheres to the coding standards -docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm composer coding-standards-check +docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm composer coding-standards-check ``` ### Markdown @@ -130,5 +130,5 @@ Running statis code analysis on a standalone Drupal module is a bit tricky, so w analysis: ```shell -docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.1-fpm ./scripts/code-analysis +docker run --rm --volume ${PWD}:/app --workdir /app itkdev/php8.3-fpm ./scripts/code-analysis ``` diff --git a/composer.json b/composer.json index 12bec7a..fb62caa 100644 --- a/composer.json +++ b/composer.json @@ -2,9 +2,18 @@ "name": "os2web/os2web_datalookup", "description": "Provides integration with Danish data lookup services such as Service platformen or Datafordeler.", "license": "EUPL-1.2", + "type": "drupal-module", "require": { + "ext-soap": "*", "os2web/os2web_key": "^1.0" }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", + "drupal/coder": "^8.3", + "ergebnis/composer-normalize": "^2.45", + "os2web/os2web_audit": "^0.1", + "phpunit/phpunit": "^9.5" + }, "repositories": { "drupal": { "type": "composer", @@ -15,29 +24,27 @@ "url": "https://asset-packagist.org" } }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^1.0", - "drupal/coder": "^8.3", - "phpunit/phpunit": "^9.5", - "os2web/os2web_audit": "^0.1" + "minimum-stability": "dev", + "prefer-stable": true, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true, + "ergebnis/composer-normalize": true + }, + "sort-packages": true }, "scripts": { - "coding-standards-check/phpcs": [ - "phpcs --standard=phpcs.xml.dist" - ], - "coding-standards-check": [ - "@coding-standards-check/phpcs" + "coding-standards-apply": [ + "@coding-standards-apply/phpcs" ], "coding-standards-apply/phpcs": [ "phpcbf --standard=phpcs.xml.dist" ], - "coding-standards-apply": [ - "@coding-standards-apply/phpcs" + "coding-standards-check": [ + "@coding-standards-check/phpcs" + ], + "coding-standards-check/phpcs": [ + "phpcs --standard=phpcs.xml.dist" ] - }, - "config": { - "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true - } } }