Skip to content

Commit

Permalink
Merge pull request #159 from ARCANEDEV/update-php_8
Browse files Browse the repository at this point in the history
Adding PHP 8 support
  • Loading branch information
arcanedev-maroc authored Feb 5, 2021
2 parents 401c041 + 5e8c094 commit 6b15276
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [7.3, 7.4]
php: [7.3, 7.4, 8.0]
dependency-version: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
Expand All @@ -30,9 +30,10 @@ jobs:
php-version: ${{ matrix.php }}
extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv, intl
coverage: xdebug
tools: composer:v2

- name: Install dependencies
run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction

- name: Execute tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ checks:
tools:
external_code_coverage:
timeout: 600
runs: 4
runs: 6
php_code_sniffer:
enabled: true
config:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
"type": "library",
"license": "MIT",
"require": {
"php": "^7.3",
"php": "^7.3|^8.0",
"ext-json": "*",
"arcanedev/support": "^8.0"
},
"require-dev": {
"ext-intl": "*",
"orchestra/testbench": "^6.0",
"mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^9.3"
"mockery/mockery": "^1.4.2",
"orchestra/testbench": "^6.4",
"phpunit/phpunit": "^9.3.3"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/Url.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static function substituteAttributes(array $attributes, $uri)
if ($value instanceof RouteBindable)
$value = $value->getWildcardValue();

$uri = str_replace(['{'.$key.'?}', '{'.$key.'}'], $value, $uri);
$uri = str_replace(['{'.$key.'?}', '{'.$key.'}'], (string) $value, $uri);
}

// delete empty optional arguments that are not in the $attributes array
Expand Down

0 comments on commit 6b15276

Please sign in to comment.