Skip to content

Commit eb471fe

Browse files
Merge pull request #50 from mirko-pagliai/develop
Develop
2 parents c661133 + ba85be8 commit eb471fe

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ matrix:
2121
env: dependencies=lowest
2222
- php: 7.3
2323
env: dependencies=lowest
24-
- php: 7.0
24+
- php: 7.2
2525
env: PHPCS=1
26-
- php: 7.0
26+
- php: 7.2
2727
env: COVERAGE=1
2828

2929
services:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"require": {
1212
"php": ">=5.5.9",
1313
"cakephp/cakephp": "^3.7",
14-
"mirko-pagliai/php-tools": "^1.2.15"
14+
"mirko-pagliai/php-tools": "~1.2.15"
1515
},
1616
"require-dev": {
17-
"cakephp/cakephp-codesniffer": "^3.0",
18-
"mirko-pagliai/me-tools": "^2.18.11",
17+
"cakephp/cakephp-codesniffer": "^3.0|^4.0",
18+
"mirko-pagliai/me-tools": "~2.18.11",
1919
"phpunit/phpunit": "^5.7.14|^6.0"
2020
},
2121
"autoload": {

phpcs.xml.dist

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,17 @@
44
<file>.</file>
55

66
<rule ref="./vendor/mirko-pagliai/php-tools/sniffer-ruleset.xml"/>
7+
8+
<rule ref="Generic.Files.LineLength.TooLong">
9+
<severity>0</severity>
10+
</rule>
11+
<rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace.UseFromSameNamespace">
12+
<severity>0</severity>
13+
</rule>
14+
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing">
15+
<severity>0</severity>
16+
</rule>
17+
<rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue.NullabilitySymbolRequired">
18+
<severity>0</severity>
19+
</rule>
720
</ruleset>

0 commit comments

Comments
 (0)