Skip to content

Commit 339d40a

Browse files
authored
Merge branch 'master' into feature/dump-exception
2 parents 8c03ad6 + 08a14f8 commit 339d40a

File tree

115 files changed

+674
-686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+674
-686
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: "🐛 Bug Report"
3+
about: "If something isn't working as expected 🤔"
4+
5+
---
6+
7+
Version: ?.?.?
8+
9+
### Bug Description
10+
... A clear and concise description of what the bug is. A good bug report shouldn't leave others needing to chase you up for more information.
11+
12+
### Steps To Reproduce
13+
... If possible a minimal demo of the problem ...
14+
15+
### Expected Behavior
16+
... A clear and concise description of what you expected to happen.
17+
18+
### Possible Solution
19+
... Only if you have suggestions on a fix for the bug
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
name: "🚀 Feature Request"
3+
about: "I have a suggestion (and may want to implement it) 🙂"
4+
5+
---
6+
7+
- Is your feature request related to a problem? Please describe.
8+
- Explain your intentions.
9+
- It's up to you to make a strong case to convince the project's developers of the merits of this feature.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: "🤗 Support Question"
3+
about: "If you have a question 💬, please check out our forum!"
4+
5+
---
6+
7+
--------------^ Click "Preview" for a nicer view!
8+
We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks! 😁.
9+
10+
* Nette Forum: https://forum.nette.org
11+
* Nette Gitter: https://gitter.im/nette/nette
12+
* Slack (czech): https://pehapkari.slack.com/messages/C2R30BLKA
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: "❤️ Support us"
3+
about: "If you would like to support our efforts in maintaining this project 🙌"
4+
5+
---
6+
7+
--------------^ Click "Preview" for a nicer view!
8+
9+
> https://nette.org/donate
10+
11+
Help support Nette!
12+
13+
We develop Nette Framework for more than 14 years. In order to make your life more comfortable. Nette cares about the safety of your sites. Nette saves you time. And gives job opportunities.
14+
15+
Nette earns you money. And is absolutely free.
16+
17+
To ensure future development and improving the documentation, we need your donation.
18+
19+
Whether you are chief of IT company which benefits from Nette, or developer who goes for advice on our forum, if you like Nette, [please make a donation now](https://nette.org/donate).
20+
21+
Thank you!

.github/issue_template.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
- bug fix? yes/no <!-- #issue numbers, if any -->
2-
- new feature? yes/no
1+
- bug fix / new feature? <!-- #issue numbers, if any -->
32
- BC break? yes/no
43
- doc PR: nette/docs#??? <!-- highly welcome, see https://nette.org/en/writing -->
54

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
language: php
22
php:
3-
- 5.6
4-
- 7.0
53
- 7.1
64
- 7.2
75

@@ -31,11 +29,11 @@ jobs:
3129
php: 7.1
3230
install:
3331
# Install Nette Code Checker
34-
- travis_retry composer create-project nette/code-checker temp/code-checker ~2 --no-progress
32+
- travis_retry composer create-project nette/code-checker temp/code-checker ^3.0 --no-progress
3533
# Install Nette Coding Standard
3634
- travis_retry composer create-project nette/coding-standard temp/coding-standard --no-progress
3735
script:
38-
- php temp/code-checker/src/code-checker.php --short-arrays
36+
- php temp/code-checker/src/code-checker.php --strict-types -i "tests/*/fixtures*" -i tests/Runner/find-tests
3937
- php temp/coding-standard/ecs check src tests --config tests/coding-standard.neon;
4038

4139

appveyor.yml

Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,33 @@ init:
88
- SET ANSICON=121x90 (121x90)
99

1010
install:
11-
# Install PHP 5.6
12-
- IF EXIST c:\php\56 (SET PHP=0) ELSE (SET PHP=1)
13-
- IF %PHP%==1 mkdir c:\php\56
14-
- IF %PHP%==1 cd c:\php\56
15-
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.6.30-Win32-VC11-x86.zip
16-
- IF %PHP%==1 7z x php-5.6.30-Win32-VC11-x86.zip >nul
17-
- IF %PHP%==1 del /Q *.zip
18-
19-
# Install PHP 7.0
20-
- IF EXIST c:\php\70 (SET PHP=0) ELSE (SET PHP=1)
21-
- IF %PHP%==1 mkdir c:\php\70
22-
- IF %PHP%==1 cd c:\php\70
23-
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.0.20-Win32-VC14-x86.zip
24-
- IF %PHP%==1 7z x php-7.0.20-Win32-VC14-x86.zip >nul
25-
- IF %PHP%==1 del /Q *.zip
26-
2711
# Install PHP 7.1
2812
- IF EXIST c:\php\71 (SET PHP=0) ELSE (SET PHP=1)
2913
- IF %PHP%==1 mkdir c:\php\71
3014
- IF %PHP%==1 cd c:\php\71
31-
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.1.6-Win32-VC14-x86.zip
32-
- IF %PHP%==1 7z x php-7.1.6-Win32-VC14-x86.zip >nul
15+
- IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.1.6-Win32-VC14-x64.zip --output php.zip
16+
- IF %PHP%==1 7z x php.zip >nul
3317
- IF %PHP%==1 del /Q *.zip
3418

35-
# Install PHP 7.1 x64
36-
- IF EXIST c:\php\71x64 (SET PHP=0) ELSE (SET PHP=1)
37-
- IF %PHP%==1 mkdir c:\php\71x64
38-
- IF %PHP%==1 cd c:\php\71x64
39-
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.1.6-Win32-VC14-x64.zip
40-
- IF %PHP%==1 7z x php-7.1.6-Win32-VC14-x64.zip >nul
19+
# Install PHP 7.2
20+
- IF EXIST c:\php\72 (SET PHP=0) ELSE (SET PHP=1)
21+
- IF %PHP%==1 mkdir c:\php\72
22+
- IF %PHP%==1 cd c:\php\72
23+
- IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.2.2-Win32-VC15-x64.zip --output php.zip
24+
- IF %PHP%==1 7z x php.zip >nul
4125
- IF %PHP%==1 del /Q *.zip
4226

4327
- cd c:\projects\tester
4428

4529
test_script:
46-
- c:\php\56\php src\tester tests -s -p c:\php\56\php
47-
- c:\php\56\php src\tester tests -s -p c:\php\56\php-cgi
48-
49-
- c:\php\70\php src\tester tests -s -p c:\php\70\php
50-
- c:\php\70\php src\tester tests -s -p c:\php\70\php-cgi
51-
- c:\php\70\php src\tester tests -s -p c:\php\70\phpdbg
52-
5330
- c:\php\71\php src\tester tests -s -p c:\php\71\php
5431
- c:\php\71\php src\tester tests -s -p c:\php\71\php-cgi
5532
- c:\php\71\php src\tester tests -s -p c:\php\71\phpdbg
5633

57-
- c:\php\71x64\php src\tester tests -s -p c:\php\71x64\php
58-
- c:\php\71x64\php src\tester tests -s -p c:\php\71x64\php-cgi
59-
- c:\php\71x64\php src\tester tests -s -p c:\php\71x64\phpdbg
34+
- c:\php\72\php src\tester tests -s -p c:\php\72\php
35+
- c:\php\72\php src\tester tests -s -p c:\php\72\php-cgi
36+
- c:\php\72\php src\tester tests -s -p c:\php\72\phpdbg
37+
38+
on_failure:
39+
# Print *.actual content
40+
- for /r %%x in (*.actual) do ( type "%%x" )

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
}
1616
],
1717
"require": {
18-
"php": ">=5.6.0"
18+
"php": ">=7.1"
1919
},
2020
"autoload": {
2121
"classmap": ["src/"]
2222
},
2323
"bin": ["src/tester"],
2424
"extra": {
25-
"branch-alias": { "dev-master": "2.0-dev" }
25+
"branch-alias": { "dev-master": "2.1-dev" }
2626
}
2727
}

readme.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ composer require nette/tester --dev
2929

3030
Alternatively, you can download the [tester.phar](https://github.com/nette/tester/releases) file.
3131

32-
Nette Tester requires PHP 5.6.0 and supports PHP up to 7.2. Collecting and processing
32+
Nette Tester requires PHP 7.1 and supports PHP up to 7.2. Collecting and processing
3333
code coverage information depends on Xdebug, or PHPDBG.
3434

3535

@@ -72,9 +72,9 @@ Now we run tests from command-line using the `tester` command:
7272
> tester
7373
_____ ___ ___ _____ ___ ___
7474
|_ _/ __)( __/_ _/ __)| _ )
75-
|_| \___ /___) |_| \___ |_|_\ v2.0.1
75+
|_| \___ /___) |_| \___ |_|_\ v2.1.0
7676
77-
PHP 5.6.0 | php -n | 8 threads
77+
PHP 7.2.3 | php -n | 8 threads
7878
.
7979
OK (1 tests, 0 skipped, 0.0 seconds)
8080
```

0 commit comments

Comments
 (0)