Unverified Commit c9ad5722 authored by Armando Lüscher's avatar Armando Lüscher Committed by GitHub

Merge branch 'develop' into remove_botan

parents eab30672 89af4d43
...@@ -6,6 +6,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c ...@@ -6,6 +6,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
## [Unreleased] ## [Unreleased]
### Added ### Added
### Changed ### Changed
- Use PSR-12 for code style.
### Deprecated ### Deprecated
### Removed ### Removed
- Botan.io integration completely removed. - Botan.io integration completely removed.
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
}, },
"scripts": { "scripts": {
"check-code": [ "check-code": [
"\"vendor/bin/phpcs\" --standard=phpcs.xml -snp --encoding=utf-8 src/ tests/ --report-width=150" "\"vendor/bin/phpcs\" --standard=phpcs.xml -snp src/ tests/"
], ],
"test": [ "test": [
"\"vendor/bin/phpunit\"" "\"vendor/bin/phpunit\""
......
...@@ -3,8 +3,11 @@ ...@@ -3,8 +3,11 @@
<description>PHP Code Sniffer</description> <description>PHP Code Sniffer</description>
<arg name="colors"/> <arg name="colors"/>
<arg name="parallel" value="8"/>
<arg name="encoding" value="utf-8"/>
<arg name="report-width" value="150"/>
<rule ref="PSR2"/> <rule ref="PSR12"/>
<rule ref="Generic.CodeAnalysis.EmptyStatement"/> <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
<rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/> <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
......
...@@ -74,7 +74,7 @@ class CommandTest extends TestCase ...@@ -74,7 +74,7 @@ class CommandTest extends TestCase
[null], [null],
[12345], [12345],
['something'], ['something'],
[new \stdClass], [new \stdClass()],
[$this->telegram], // only this one is valid [$this->telegram], // only this one is valid
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment