Skip to content

Commit

Permalink
Merge pull request #33 from ARCANEDEV/php-8-support
Browse files Browse the repository at this point in the history
Adding PHP 8.0 Support
  • Loading branch information
arcanedev-maroc authored Nov 30, 2020
2 parents 162cf44 + 8df59f6 commit b3bd5dd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 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
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 @@ -23,7 +23,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",
"arcanedev/php-html": "^5.0",
"arcanedev/support": "^8.0"
},
"require-dev": {
"ext-dom": "*",
"orchestra/testbench": "^6.0",
"mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^9.3"
"orchestra/testbench": "^6.4",
"mockery/mockery": "^1.4.2",
"phpunit/phpunit": "^9.3.3"
},
"autoload": {
"psr-4": {
Expand Down
3 changes: 3 additions & 0 deletions src/FormBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,9 @@ private function getModelValueAttribute(string $name, $model = null)
);
}

if (is_null($model) || is_array($model))
return data_get($model, $key);

return method_exists($model, 'getFormValue')
? $model->getFormValue($key)
: data_get($model, $key);
Expand Down

0 comments on commit b3bd5dd

Please sign in to comment.