Merge pull request #56 from OPUS4/4.7.2

4.7.2

.github/workflows/php.yml

@@ -12,15 +12,24 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        php-versions: ['7.1', '7.4', '8.1']
+
+    name: PHP ${{ matrix.php-versions }} Test
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Setup PHP 7.4
+      - name: Setup PHP ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: ${{ matrix.php-versions }}
+
+      - name: Check PHP Version
+        run: php -v
 
       - name: Install Pandoc
         run: sudo apt-get install pandoc

.gitignore

@@ -17,3 +17,4 @@ build
 
 # Other
 **/.DS_Store
+.phpunit.result.cache

composer.json

@@ -9,16 +9,16 @@
   ],
   "homepage": "https://www.opus-repository.org",
   "require": {
-    "php" : ">=7.0",
+    "php" : ">=7.1",
     "ext-json" : "*",
     "renanbr/bibtex-parser": "^2.1.2",
     "ryakad/pandoc-php": "~1.0",
-    "opus4-repo/opus4-common": "dev-master",
+    "opus4-repo/opus4-common": "^4.8",
     "symfony/console": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "6.*",
-    "laminas/laminas-coding-standard": "<2.3",
+    "phpunit/phpunit": "<9",
+    "opus4-repo/codesniffer": "dev-laminas",
     "phpmetrics/phpmetrics": "2.7.4"
   },
   "minimum-stability": "dev",
@@ -46,7 +46,7 @@
     "prepare": "mkdir -p build",
     "test": "phpunit --colors=always --log-junit build/phpunit.xml",
     "test-coverage": "phpunit --log-junit build/phpunit.xml --colors=always --coverage-html build/coverage/ --coverage-clover build/coverage/clover.xml",
-    "cs-check": "phpcs -n",
+    "cs-check": "phpcs -n -p",
     "cs-report": "phpcs -n --report=checkstyle --report-file=build/checkstyle.xml",
     "cs-fix": "phpcbf",
     "metrics": "phpmetrics --report-html=build/metrics --junit=build/phpunit.xml ."

phpcs.xml

@@ -1,27 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="OPUS 4 coding standard">
-    <rule ref="./vendor/laminas/laminas-coding-standard/src/LaminasCodingStandard/ruleset.xml" />
+    <rule ref="./vendor/opus4-repo/codesniffer/src/ruleset.xml" />
     <file>src</file>
     <file>test</file>
-
-    <!-- Loosening the Laminas coding style to allow our customary annotations. -->
-    <rule ref="SlevomatCodingStandard.Commenting.ForbiddenAnnotations">
-        <properties>
-            <property name="forbiddenAnnotations" type="array">
-                <element value="@api"/>
-                <element value="@created"/>
-                <element value="@subpackage"/>
-                <element value="@version"/>
-                <element value="@expectedException"/>
-                <element value="@expectedExceptionCode"/>
-                <element value="@expectedExceptionMessage"/>
-                <element value="@expectedExceptionMessageRegExp"/>
-            </property>
-        </properties>
-    </rule>
-
-    <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue">
-        <type>warning</type>
-    </rule>
-
 </ruleset>