Merge branch 'hotfix/1.9.6'

abrain · Aug 29, 2021 · fbeeb07 · fbeeb07
2 parents 8b0326a + b6b99b5
commit fbeeb07
Show file tree

Hide file tree

Showing 12 changed files with 200 additions and 1,141 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -15,16 +15,17 @@ steps:
     image: composer
     commands:
       - composer install --ignore-platform-reqs
+  - name: check-php-compatibility
+    image: php:7
+    commands:
+      - ./vendor/bin/phpcs -p --ignore="\.min\.css" src/ --standard=PHPCompatibility
   - name: test
     image: php:7
     environment:
       CC_TEST_REPORTER_ID:
         from_secret: cc_test_reporter_id
     commands:
-      - apt-get update && apt-get install -y zlib1g-dev libicu-dev g++ git
-      - docker-php-ext-configure intl
-      - docker-php-ext-install intl
-      - ./vendor/bin/phpunit -c phpunit-checks.xml --no-coverage
+      - apt-get update && apt-get install -y git
       - pecl install xdebug
       - docker-php-ext-enable xdebug
       - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

diff --git a/.idea/Einsatzverwaltung.iml b/.idea/Einsatzverwaltung.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/composer.json b/composer.json
@@ -29,13 +29,14 @@
   },
   "require-dev": {
     "phpunit/phpunit": "^7.5",
-    "bartlett/php-compatinfo": "^5.2",
     "phpmd/phpmd": "^2.9",
     "squizlabs/php_codesniffer": "^3.5",
     "brain/monkey": "^2.6",
     "friendsofphp/php-cs-fixer": "^2.18",
     "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
     "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2",
-    "sebastian/comparator": "^3.0"
+    "sebastian/comparator": "^3.0",
+    "phpcompatibility/php-compatibility": "^9.3",
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1"
   }
 }