Skip to content

Commit

Permalink
podpora pro nette 2.4 a php 8
Browse files Browse the repository at this point in the history
  • Loading branch information
krejzyeu committed Jan 10, 2024
1 parent 96e1102 commit 2a33b47
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 18 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/php-package-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: [ 7.0, 7.1 ]
php: [ 7.4, 8.0 ]
steps:
- uses: actions/checkout@v2
- uses: shivammathur/setup-php@v2
Expand All @@ -18,7 +18,6 @@ jobs:

- run: make composer

- if: matrix.php == '7.1'
run: make phpstan
- run: make phpstan

- run: make run-tests
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ phpstan:
vendor/bin/phpstan analyse -l 5 -c phpstan.neon src/

run-tests:
vendor/bin/tester tests
vendor/bin/tester tests -d extension=tokenizer.so
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
}
],
"require": {
"php": "~7.0",
"nette/application": ">= 2.2.10 < 2.3.0"
"php": "~7.4 | ~8.0",
"nette/application": "^2.4"
},
"require-dev": {
"phpstan/phpstan": "~0.6.0",
"nette/tester": "~1.7.0",
"mockery/mockery": "~0.9.0"
"phpstan/phpstan": "^1.0",
"nette/tester": "^2.0",
"mockery/mockery": "^1.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 1 addition & 5 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
parameters:
ignoreErrors:
- '#Call to an undefined method [a-zA-Z0-9\\_]+::renderAsync\(\)#'
- '#Call to an undefined method [a-zA-Z0-9\\_]+::render\(\)#'
fileExtensions:
- phpt

autoload_directories:
# - %rootDir%/../../../test

treatPhpDocTypesAsCertain: false
5 changes: 1 addition & 4 deletions src/UI/AsyncControlTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


/**
* @method render
* @method render()
*/
trait AsyncControlTrait
{
Expand All @@ -31,9 +31,6 @@ public function handleAsyncLoad()
} catch (\Throwable $e) {
ob_end_clean();
throw $e;
} catch (\Exception $e) {
ob_end_clean();
throw $e;
}
$content = ob_get_clean();
$presenter->getPayload()->snippets[$this->getSnippetId('async')] = $content;
Expand Down

0 comments on commit 2a33b47

Please sign in to comment.