Skip to content

Commit 2a33b47

Browse files
committed
podpora pro nette 2.4 a php 8
1 parent 96e1102 commit 2a33b47

File tree

5 files changed

+10
-18
lines changed

5 files changed

+10
-18
lines changed

.github/workflows/php-package-ci.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
php: [ 7.0, 7.1 ]
12+
php: [ 7.4, 8.0 ]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: shivammathur/setup-php@v2
@@ -18,7 +18,6 @@ jobs:
1818

1919
- run: make composer
2020

21-
- if: matrix.php == '7.1'
22-
run: make phpstan
21+
- run: make phpstan
2322

2423
- run: make run-tests

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ phpstan:
66
vendor/bin/phpstan analyse -l 5 -c phpstan.neon src/
77

88
run-tests:
9-
vendor/bin/tester tests
9+
vendor/bin/tester tests -d extension=tokenizer.so

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
}
2222
],
2323
"require": {
24-
"php": "~7.0",
25-
"nette/application": ">= 2.2.10 < 2.3.0"
24+
"php": "~7.4 | ~8.0",
25+
"nette/application": "^2.4"
2626
},
2727
"require-dev": {
28-
"phpstan/phpstan": "~0.6.0",
29-
"nette/tester": "~1.7.0",
30-
"mockery/mockery": "~0.9.0"
28+
"phpstan/phpstan": "^1.0",
29+
"nette/tester": "^2.0",
30+
"mockery/mockery": "^1.0"
3131
},
3232
"autoload": {
3333
"psr-4": {

phpstan.neon

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
parameters:
22
ignoreErrors:
3-
- '#Call to an undefined method [a-zA-Z0-9\\_]+::renderAsync\(\)#'
4-
- '#Call to an undefined method [a-zA-Z0-9\\_]+::render\(\)#'
53
fileExtensions:
64
- phpt
75

8-
autoload_directories:
9-
# - %rootDir%/../../../test
10-
6+
treatPhpDocTypesAsCertain: false

src/UI/AsyncControlTrait.php

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
/**
11-
* @method render
11+
* @method render()
1212
*/
1313
trait AsyncControlTrait
1414
{
@@ -31,9 +31,6 @@ public function handleAsyncLoad()
3131
} catch (\Throwable $e) {
3232
ob_end_clean();
3333
throw $e;
34-
} catch (\Exception $e) {
35-
ob_end_clean();
36-
throw $e;
3734
}
3835
$content = ob_get_clean();
3936
$presenter->getPayload()->snippets[$this->getSnippetId('async')] = $content;

0 commit comments

Comments
 (0)