Merge branch 'master' into feature/dump-exception

Author: trejjam

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,19 @@
+---
+name: "🐛 Bug Report"
+about: "If something isn't working as expected 🤔"
+
+---
+
+Version: ?.?.?
+
+### Bug Description
+... 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.
+
+### Steps To Reproduce
+... If possible a minimal demo of the problem ...
+
+### Expected Behavior
+... A clear and concise description of what you expected to happen.
+
+### Possible Solution
+... Only if you have suggestions on a fix for the bug

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,9 @@
+---
+name: "🚀 Feature Request"
+about: "I have a suggestion (and may want to implement it) 🙂"
+
+---
+
+- Is your feature request related to a problem? Please describe.
+- Explain your intentions.
+- It's up to you to make a strong case to convince the project's developers of the merits of this feature.

.github/ISSUE_TEMPLATE/Support_question.md

@@ -0,0 +1,12 @@
+---
+name: "🤗 Support Question"
+about: "If you have a question 💬, please check out our forum!"
+
+---
+
+--------------^ Click "Preview" for a nicer view!
+We primarily use GitHub as an issue tracker; for usage and support questions, please check out these resources below. Thanks! 😁.
+
+* Nette Forum: https://forum.nette.org
+* Nette Gitter: https://gitter.im/nette/nette
+* Slack (czech): https://pehapkari.slack.com/messages/C2R30BLKA

.github/ISSUE_TEMPLATE/Support_us.md

@@ -0,0 +1,21 @@
+---
+name: "❤️ Support us"
+about: "If you would like to support our efforts in maintaining this project 🙌"
+
+---
+
+--------------^ Click "Preview" for a nicer view!
+
+> https://nette.org/donate
+
+Help support Nette!
+
+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.
+
+Nette earns you money. And is absolutely free.
+
+To ensure future development and improving the documentation, we need your donation.
+
+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).
+
+Thank you!

.github/issue_template.md

@@ -1,5 +1,4 @@
-- bug fix? yes/no   <!-- #issue numbers, if any -->
-- new feature? yes/no
+- bug fix / new feature?   <!-- #issue numbers, if any -->
 - BC break? yes/no
 - doc PR: nette/docs#???  <!-- highly welcome, see https://nette.org/en/writing -->
 

.github/pull_request_template.md

@@ -1,7 +1,5 @@
 language: php
 php:
-    - 5.6
-    - 7.0
     - 7.1
     - 7.2
 
@@ -31,11 +29,11 @@ jobs:
             php: 7.1
             install:
                 # Install Nette Code Checker
-                - travis_retry composer create-project nette/code-checker temp/code-checker ~2 --no-progress
+                - travis_retry composer create-project nette/code-checker temp/code-checker ^3.0 --no-progress
                 # Install Nette Coding Standard
                 - travis_retry composer create-project nette/coding-standard temp/coding-standard --no-progress
             script:
-                - php temp/code-checker/src/code-checker.php --short-arrays
+                - php temp/code-checker/src/code-checker.php --strict-types -i "tests/*/fixtures*" -i tests/Runner/find-tests
                 - php temp/coding-standard/ecs check src tests --config tests/coding-standard.neon;
 
 

.travis.yml

@@ -8,52 +8,33 @@ init:
     - SET ANSICON=121x90 (121x90)
 
 install:
-    # Install PHP 5.6
-    - IF EXIST c:\php\56 (SET PHP=0) ELSE (SET PHP=1)
-    - IF %PHP%==1 mkdir c:\php\56
-    - IF %PHP%==1 cd c:\php\56
-    - IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.6.30-Win32-VC11-x86.zip
-    - IF %PHP%==1 7z x php-5.6.30-Win32-VC11-x86.zip >nul
-    - IF %PHP%==1 del /Q *.zip
-
-    # Install PHP 7.0
-    - IF EXIST c:\php\70 (SET PHP=0) ELSE (SET PHP=1)
-    - IF %PHP%==1 mkdir c:\php\70
-    - IF %PHP%==1 cd c:\php\70
-    - IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.0.20-Win32-VC14-x86.zip
-    - IF %PHP%==1 7z x php-7.0.20-Win32-VC14-x86.zip >nul
-    - IF %PHP%==1 del /Q *.zip
-
     # Install PHP 7.1
     - IF EXIST c:\php\71 (SET PHP=0) ELSE (SET PHP=1)
     - IF %PHP%==1 mkdir c:\php\71
     - IF %PHP%==1 cd c:\php\71
-    - IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.1.6-Win32-VC14-x86.zip
-    - IF %PHP%==1 7z x php-7.1.6-Win32-VC14-x86.zip >nul
+    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.1.6-Win32-VC14-x64.zip --output php.zip
+    - IF %PHP%==1 7z x php.zip >nul
     - IF %PHP%==1 del /Q *.zip
 
-    # Install PHP 7.1 x64
-    - IF EXIST c:\php\71x64 (SET PHP=0) ELSE (SET PHP=1)
-    - IF %PHP%==1 mkdir c:\php\71x64
-    - IF %PHP%==1 cd c:\php\71x64
-    - IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-7.1.6-Win32-VC14-x64.zip
-    - IF %PHP%==1 7z x php-7.1.6-Win32-VC14-x64.zip >nul
+    # Install PHP 7.2
+    - IF EXIST c:\php\72 (SET PHP=0) ELSE (SET PHP=1)
+    - IF %PHP%==1 mkdir c:\php\72
+    - IF %PHP%==1 cd c:\php\72
+    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.2.2-Win32-VC15-x64.zip --output php.zip
+    - IF %PHP%==1 7z x php.zip >nul
     - IF %PHP%==1 del /Q *.zip
 
     - cd c:\projects\tester
 
 test_script:
-    - c:\php\56\php src\tester tests -s -p c:\php\56\php
-    - c:\php\56\php src\tester tests -s -p c:\php\56\php-cgi
-
-    - c:\php\70\php src\tester tests -s -p c:\php\70\php
-    - c:\php\70\php src\tester tests -s -p c:\php\70\php-cgi
-    - c:\php\70\php src\tester tests -s -p c:\php\70\phpdbg
-
     - c:\php\71\php src\tester tests -s -p c:\php\71\php
     - c:\php\71\php src\tester tests -s -p c:\php\71\php-cgi
     - c:\php\71\php src\tester tests -s -p c:\php\71\phpdbg
 
-    - c:\php\71x64\php src\tester tests -s -p c:\php\71x64\php
-    - c:\php\71x64\php src\tester tests -s -p c:\php\71x64\php-cgi
-    - c:\php\71x64\php src\tester tests -s -p c:\php\71x64\phpdbg
+    - c:\php\72\php src\tester tests -s -p c:\php\72\php
+    - c:\php\72\php src\tester tests -s -p c:\php\72\php-cgi
+    - c:\php\72\php src\tester tests -s -p c:\php\72\phpdbg
+
+on_failure:
+    # Print *.actual content
+    - for /r %%x in (*.actual) do ( type "%%x" )

appveyor.yml

@@ -15,13 +15,13 @@
 		}
 	],
 	"require": {
-		"php": ">=5.6.0"
+		"php": ">=7.1"
 	},
 	"autoload": {
 		"classmap": ["src/"]
 	},
 	"bin": ["src/tester"],
 	"extra": {
-		"branch-alias": { "dev-master": "2.0-dev" }
+		"branch-alias": { "dev-master": "2.1-dev" }
 	}
 }

composer.json

@@ -29,7 +29,7 @@ composer require nette/tester --dev
 
 Alternatively, you can download the [tester.phar](https://github.com/nette/tester/releases) file.
 
-Nette Tester requires PHP 5.6.0 and supports PHP up to 7.2. Collecting and processing
+Nette Tester requires PHP 7.1 and supports PHP up to 7.2. Collecting and processing
 code coverage information depends on Xdebug, or PHPDBG.
 
 
@@ -72,9 +72,9 @@ Now we run tests from command-line using the `tester` command:
 > tester
  _____ ___  ___ _____ ___  ___
 |_   _/ __)( __/_   _/ __)| _ )
-  |_| \___ /___) |_| \___ |_|_\  v2.0.1
+  |_| \___ /___) |_| \___ |_|_\  v2.1.0
 
-PHP 5.6.0 | php -n | 8 threads
+PHP 7.2.3 | php -n | 8 threads
 .
 OK (1 tests, 0 skipped, 0.0 seconds)
 ```

readme.md

@@ -5,6 +5,8 @@
  * Copyright (c) 2009 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tester\CodeCoverage;
 
 
@@ -20,29 +22,24 @@ class Collector
 	private static $collector;
 
 
-	/**
-	 * @return bool
-	 */
-	public static function isStarted()
+	public static function isStarted(): bool
 	{
 		return self::$file !== null;
 	}
 
 
 	/**
 	 * Starts gathering the information for code coverage.
-	 * @param  string
-	 * @return void
 	 * @throws \LogicException
 	 */
-	public static function start($file)
+	public static function start(string $file): void
 	{
 		if (self::isStarted()) {
 			throw new \LogicException('Code coverage collector has been already started.');
 		}
 		self::$file = fopen($file, 'c+');
 
-		if (defined('PHPDBG_VERSION') && PHP_VERSION_ID >= 70000) {
+		if (defined('PHPDBG_VERSION')) {
 			phpdbg_start_oplog();
 			self::$collector = 'collectPhpDbg';
 
@@ -51,8 +48,7 @@ public static function start($file)
 			self::$collector = 'collectXdebug';
 
 		} else {
-			$alternative = PHP_VERSION_ID >= 70000 ? ' or phpdbg SAPI' : '';
-			throw new \LogicException("Code coverage functionality requires Xdebug extension$alternative.");
+			throw new \LogicException('Code coverage functionality requires Xdebug extension or phpdbg SAPI.');
 		}
 
 		register_shutdown_function(function () {
@@ -64,7 +60,7 @@ public static function start($file)
 	/**
 	 * Flushes all gathered information. Effective only with PHPDBG collector.
 	 */
-	public static function flush()
+	public static function flush(): void
 	{
 		if (self::isStarted() && self::$collector === 'collectPhpDbg') {
 			self::save();
@@ -74,16 +70,15 @@ public static function flush()
 
 	/**
 	 * Saves information about code coverage. Can be called repeatedly to free memory.
-	 * @return void
 	 * @throws \LogicException
 	 */
-	public static function save()
+	public static function save(): void
 	{
 		if (!self::isStarted()) {
 			throw new \LogicException('Code coverage collector has not been started.');
 		}
 
-		list($positive, $negative) = call_user_func([__CLASS__, self::$collector]);
+		[$positive, $negative] = [__CLASS__, self::$collector]();
 
 		flock(self::$file, LOCK_EX);
 		fseek(self::$file, 0);
@@ -100,9 +95,8 @@ public static function save()
 
 	/**
 	 * Collects information about code coverage.
-	 * @return array
 	 */
-	private static function collectXdebug()
+	private static function collectXdebug(): array
 	{
 		$positive = $negative = [];
 
@@ -126,9 +120,8 @@ private static function collectXdebug()
 
 	/**
 	 * Collects information about code coverage.
-	 * @return array
 	 */
-	private static function collectPhpDbg()
+	private static function collectPhpDbg(): array
 	{
 		$positive = phpdbg_end_oplog();
 		$negative = phpdbg_get_executable();

src/CodeCoverage/Collector.php

@@ -5,6 +5,8 @@
  * Copyright (c) 2009 David Grudl (https://davidgrudl.com)
  */
 
+declare(strict_types=1);
+
 namespace Tester\CodeCoverage\Generators;
 
 
@@ -13,7 +15,7 @@
  */
 abstract class AbstractGenerator
 {
-	const
+	protected const
 		CODE_DEAD = -2,
 		CODE_UNTESTED = -1,
 		CODE_TESTED = 1;
@@ -35,10 +37,10 @@ abstract class AbstractGenerator
 
 
 	/**
-	 * @param  string  path to coverage.dat file
-	 * @param  string  path to covered source file or directory
+	 * @param  string  $file  path to coverage.dat file
+	 * @param  string  $source  path to covered source file or directory
 	 */
-	public function __construct($file, $source = null)
+	public function __construct(string $file, string $source = null)
 	{
 		if (!is_file($file)) {
 			throw new \Exception("File '$file' is missing.");
@@ -69,14 +71,14 @@ public function __construct($file, $source = null)
 	}
 
 
-	public function render($file = null)
+	public function render(string $file = null): void
 	{
 		$handle = $file ? @fopen($file, 'w') : STDOUT; // @ is escalated to exception
 		if (!$handle) {
 			throw new \Exception("Unable to write to file '$file'.");
 		}
 
-		ob_start(function ($buffer) use ($handle) { fwrite($handle, $buffer); }, 4096);
+		ob_start(function (string $buffer) use ($handle) { fwrite($handle, $buffer); }, 4096);
 		try {
 			$this->renderSelf();
 		} catch (\Exception $e) {
@@ -93,25 +95,19 @@ public function render($file = null)
 	}
 
 
-	/**
-	 * @return float
-	 */
-	public function getCoveredPercent()
+	public function getCoveredPercent(): float
 	{
 		return $this->totalSum ? $this->coveredSum * 100 / $this->totalSum : 0;
 	}
 
 
-	/**
-	 * @return \Iterator
-	 */
-	protected function getSourceIterator()
+	protected function getSourceIterator(): \Iterator
 	{
 		$iterator = is_dir($this->source)
 			? new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->source))
 			: new \ArrayIterator([new \SplFileInfo($this->source)]);
 
-		return new \CallbackFilterIterator($iterator, function (\SplFileInfo $file) {
+		return new \CallbackFilterIterator($iterator, function (\SplFileInfo $file): bool {
 			return $file->getBasename()[0] !== '.'  // . or .. or .gitignore
 				&& in_array($file->getExtension(), $this->acceptFiles, true);
 		});