Skip to content

Commit 3bd72b4

Browse files
authored
Merge pull request #20 from phalcon/1.3.x
1.3.x
2 parents 9487c84 + 1c5a7d0 commit 3bd72b4

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ vendor
99
composer.lock
1010
phpunit.xml
1111
phpcs.xml
12+
.phpunit.result.cache
1213

1314
infection.json
1415
infection-log.txt

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ dist: xenial
44
language: php
55
php:
66
- 'master'
7-
- '7.3.0RC1'
8-
- '7.2'
9-
- '7.1'
10-
- '7.0'
7+
- '8.0'
8+
- '7.4'
9+
- '7.3'
1110

1211
matrix:
1312
fast_finish: true
@@ -57,15 +56,15 @@ after_success:
5756
jobs:
5857
include:
5958
- stage: Static Code Analysis
60-
php: 7.2
59+
php: 7.3
6160
env: PHPStan
6261
before_script:
6362
- phpenv config-rm xdebug.ini || true
6463
- travis_retry composer require phpstan/phpstan
6564
script:
6665
- ./vendor/bin/phpstan analyse -l max src
6766
- stage: Static Code Analysis
68-
php: 7.2
67+
php: 7.3
6968
env: PHP_CodeSniffer
7069
before_script:
7170
- phpenv config-rm xdebug.ini || true

boxfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
run.config:
22
engine: php
33
engine.config:
4-
runtime: php-7.1
4+
runtime: php-7.3
55
document_root: public
66
allow_url_fopen: 'On'
77
disable_functions:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
}
2929
],
3030
"require": {
31-
"php": ">=7.0 <8.0"
31+
"php": ">=7.3"
3232
},
3333
"require-dev": {
34-
"phpunit/phpunit": ">=5.3 <8.0",
34+
"phpunit/phpunit": "^9.5.8",
3535
"squizlabs/php_codesniffer": "3.*"
3636
},
3737
"config": {

scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build:
77
postgresql: false
88
redis: false
99
php:
10-
version: 7.2
10+
version: 7.3
1111
ini:
1212
'date.timezone': 'UTC'
1313

src/Parser.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ protected function getCoalescingDefault(string $value, bool $default): bool
131131
*/
132132
protected function getParamWithEqual(string $arg, int $eqPos): array
133133
{
134+
$out = [];
134135
$key = $this->stripSlashes(substr($arg, 0, $eqPos));
135136
$out[$key] = substr($arg, $eqPos +1);
136137

tests/ParserTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ParserTest extends TestCase
3030
*
3131
* @return void
3232
*/
33-
public function setUp()
33+
public function setUp():void
3434
{
3535
$this->parser = new Parser();
3636
}

0 commit comments

Comments
 (0)