Skip to content

Commit d1d3012

Browse files
committed
Update php 7.2 and tools
1 parent 141798a commit d1d3012

File tree

11 files changed

+18
-26
lines changed

11 files changed

+18
-26
lines changed

.docker/Dockerfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
FROM php:7.0-alpine
2-
3-
RUN apk add ncurses wget gnupg \
4-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
5-
&& wget -q -O /usr/local/bin/phive https://phar.io/releases/phive.phar && chmod +x /usr/local/bin/phive
1+
FROM adlacruzes/php-ci:7.2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.idea
22
.php_cs.cache
3+
.phpunit.result.cache
34
composer.lock
45
vendor

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
language: php
22

3-
sudo: false
4-
53
php:
6-
- 7.0
7-
- 7.1
84
- 7.2
95
- 7.3
6+
- 7.4snapshot
107

118
before_script:
129
- composer self-update

composer.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414
}
1515
],
1616
"require": {
17-
"php": "^7.0"
17+
"php": "^7.2"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "^6"
20+
"adlacruzes/php-ci-tools": "dev-master",
21+
"phpunit/phpunit": "^8"
2122
},
2223
"autoload": {
2324
"psr-4": {
@@ -30,17 +31,19 @@
3031
}
3132
},
3233
"scripts": {
33-
"composer-require-checker": "tools/composer-require-checker",
34-
"phpcs": "tools/phpcs --report=source -s",
35-
"phpcbf": "tools/phpcbf",
36-
"php-cs-fixer" : "tools/php-cs-fixer fix --dry-run --diff --verbose --diff-format=udiff",
37-
"phpstan": "tools/phpstan analyse src tests --no-progress --memory-limit=1024M --level=max",
34+
"composer-require-checker": "vendor/bin/ci-tools composer-require-checker",
35+
"phpcs": "vendor/bin/ci-tools phpcs --report=source -s",
36+
"phpcbf": "vendor/bin/ci-tools phpcbf",
37+
"php-cs-fixer" : "vendor/bin/ci-tools php-cs-fixer fix --dry-run --diff --verbose --diff-format=udiff --ansi",
38+
"phpstan": "vendor/bin/ci-tools phpstan analyse src tests --no-progress --memory-limit=1024M --level=max --ansi",
39+
"security-checker": "vendor/bin/ci-tools security-checker security:check",
3840
"phpunit": "vendor/bin/phpunit",
3941
"ci": [
4042
"@composer-require-checker",
4143
"@phpcs",
4244
"@php-cs-fixer",
4345
"@phpstan",
46+
"@security-checker",
4447
"@phpunit"
4548
]
4649
},

phive.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/BaseException.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ private function generateMessage(string $message): string
3434
);
3535

3636
$generated = '';
37-
foreach ($words as $word) {
38-
$generated .= ' ' . strtolower($word);
37+
38+
if (is_iterable($words)) {
39+
foreach ($words as $word) {
40+
$generated .= ' ' . strtolower($word);
41+
}
3942
}
4043

4144
return ucfirst(trim($generated));

tools/composer-require-checker

-390 KB
Binary file not shown.

tools/php-cs-fixer

-1.64 MB
Binary file not shown.

tools/phpcbf

-1.12 MB
Binary file not shown.

tools/phpcs

-1.12 MB
Binary file not shown.

0 commit comments

Comments
 (0)