Skip to content

Commit

Permalink
Merge branch 'hotfix/1.10.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
abrain committed Oct 25, 2022
2 parents 7b30ccf + 2baac79 commit 87b906c
Show file tree
Hide file tree
Showing 43 changed files with 1,519 additions and 688 deletions.
6 changes: 1 addition & 5 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
version: "2"
plugins:
phpcodesniffer:
enabled: true
config:
file_extensions: "php"
standard: "PSR1,PSR2"
encoding: utf-8
enabled: false
phpmd:
enabled: true
config:
Expand Down
16 changes: 11 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
kind: pipeline
type: docker
name: compliance
Expand All @@ -22,11 +23,11 @@ steps:
- name: install
image: composer
commands:
- composer install --ignore-platform-reqs
- composer install
- name: check-php-compatibility
image: php:7
image: php:7.4-cli-bullseye
commands:
- ./vendor/bin/phpcs -p --ignore="\.min\.css" src/ --standard=PHPCompatibility
- ./vendor/bin/phpcs

---
kind: pipeline
Expand All @@ -48,9 +49,9 @@ steps:
- name: install
image: composer
commands:
- composer install --ignore-platform-reqs
- composer install
- name: test
image: php:7
image: php:7.4-cli-bullseye
environment:
CC_TEST_REPORTER_ID:
from_secret: cc_test_reporter_id
Expand Down Expand Up @@ -100,3 +101,8 @@ depends_on:
trigger:
event:
- tag
---
kind: signature
hmac: 8c29bef07eebae363c6e40220f4ab9adda9ecc095d300b8b8e481c9fd38333d6

...
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ setupLocalTest.sh
vendor
.DS_Store
.php_cs.cache
.phpunit.result.cache
9 changes: 9 additions & 0 deletions .idea/Einsatzverwaltung.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 20 additions & 3 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion .idea/runConfigurations/PHPUnit.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 52 additions & 0 deletions .phpcs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0"?>
<ruleset name="Einsatzverwaltung">
<description>Custom ruleset for the Einsatzverwaltung plugin.</description>

<!-- For help in understanding this file: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->
<!-- For help in using PHPCS: https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage -->

<!-- What to scan -->
<file>.</file>
<exclude-pattern>/.idea/*</exclude-pattern>
<exclude-pattern>/vendor/*</exclude-pattern>
<exclude-pattern>/src/backcompat.php</exclude-pattern>

<!-- How to scan -->
<arg value="sp"/> <!-- Show sniff and progress -->
<arg name="colors"/> <!-- Show results with colors -->
<arg name="basepath" value="."/> <!-- Strip the file paths down to the relevant bit -->
<arg name="extensions" value="php"/> <!-- Limit to PHP files -->

<!-- PHPCompatibility standard with adjustments for WordPress -->
<rule ref="PHPCompatibilityWP"/>

<!-- The PHP version range to test -->
<config name="testVersion" value="7.1-"/>

<!-- For now, continue to use the PSR2 standard. This requires to deactivate the line length sniff, because gettext calls cannot be wrapped -->
<rule ref="PSR2">
<exclude name="Generic.Files.LineLength"/>
</rule>

<!-- For help in understanding these custom sniff properties:
https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/wiki/Customizable-sniff-properties -->
<config name="minimum_supported_wp_version" value="5.1"/>

<rule ref="WordPress.WP.I18n">
<properties>
<property name="text_domain" type="array">
<element value="einsatzverwaltung"/>
<element value="default"/>
</property>
</properties>
</rule>

<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
<properties>
<property name="prefixes" type="array">
<element value="einsatzverwaltung"/>
<element value="abrain\Einsatzverwaltung"/>
</property>
</properties>
</rule>
</ruleset>
15 changes: 12 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,21 @@
},
"config": {
"platform": {
"php": "7.1.27"
"php": "7.4.29"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"scripts": {
"lint": "phpcs",
"test": "XDEBUG_MODE=coverage phpunit",
"integration-test": "phpunit -c phpunit-integration.xml"
},
"require": {
"php": ">=7.1.0"
},
"require-dev": {
"phpunit/phpunit": "^7.5",
"phpmd/phpmd": "^2.9",
"squizlabs/php_codesniffer": "^3.5",
"brain/monkey": "^2.6",
Expand All @@ -38,6 +45,8 @@
"sebastian/comparator": "^3.0",
"phpcompatibility/php-compatibility": "^9.3",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"yoast/phpunit-polyfills": "^1.0"
"yoast/phpunit-polyfills": "^1.0",
"phpcompatibility/phpcompatibility-wp": "^2.1.2",
"wp-coding-standards/wpcs": "^2.3.0"
}
}
Loading

0 comments on commit 87b906c

Please sign in to comment.