Updated PHPUnit and Mockery

Author: freost

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .php_cs.cache
-composer.phar
-composer.lock
+.phpunit.result.cache
 /vendor
+composer.lock
+composer.phar

.php_cs

@@ -10,6 +10,7 @@ return Config::create()
 	'blank_line_after_namespace' => true,
 	'blank_line_after_opening_tag' => true,
 	'cast_spaces' => true,
+	'combine_nested_dirname' => true,
 	'concat_space' => ['spacing' => 'one'],
 	'elseif' => true,
 	'encoding' => true,
@@ -18,6 +19,7 @@ return Config::create()
 	'function_to_constant' => true,
 	'function_typehint_space' => true,
 	'linebreak_after_opening_tag' => true,
+	'list_syntax' => ['syntax' => 'short'],
 	'logical_operators' => true,
 	'lowercase_cast' => true,
 	'lowercase_constants' => true,
@@ -43,6 +45,8 @@ return Config::create()
 	'no_unused_imports' => true,
 	'no_whitespace_before_comma_in_array' => true,
 	'no_whitespace_in_blank_line' => true,
+	'non_printable_character' => true,
+	'normalize_index_brace' => true,
 	'object_operator_without_whitespace' => true,
 	'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
 	'phpdoc_align' => true,
@@ -69,6 +73,8 @@ return Config::create()
 	'switch_case_space' => true,
 	'trailing_comma_in_multiline_array' => true,
 	'trim_array_spaces' => true,
+	'visibility_required' => true,
+	'void_return' => true,
 	'whitespace_after_comma_in_array' => true,
 ])
 ->setRiskyAllowed(true)

.travis.yml

@@ -4,9 +4,8 @@ sudo: false
 
 matrix:
   include:
-    - php: 7.0
-    - php: 7.1
     - php: 7.2
+    - php: 7.3
   fast_finish: true
 
 services:

composer.json

@@ -15,11 +15,11 @@
 		]
 	},
 	"require": {
-		"php": ">=7.0.0"
+		"php": ">=7.2.0"
 	},
 	"require-dev": {
-		"mockery/mockery": "^1.0",
-		"phpunit/phpunit": "^6.5.0"
+		"phpunit/phpunit": "^8.0",
+		"mockery/mockery": "^1.2"
 	},
 	"extra": {
 		"branch-alias": {

tests/unit/HelpersTest.php

@@ -25,7 +25,7 @@ class HelpersTest extends PHPUnitTestCase
 	/**
 	 *
 	 */
-	public function testApp()
+	public function testApp(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -39,7 +39,7 @@ public function testApp()
 	/**
 	 *
 	 */
-	public function testContainer()
+	public function testContainer(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -55,7 +55,7 @@ public function testContainer()
 	/**
 	 *
 	 */
-	public function testConfig()
+	public function testConfig(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -71,7 +71,7 @@ public function testConfig()
 	/**
 	 *
 	 */
-	public function testRequest()
+	public function testRequest(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -91,7 +91,7 @@ public function testRequest()
 	/**
 	 *
 	 */
-	public function testCookie()
+	public function testCookie(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -117,7 +117,7 @@ public function testCookie()
 	/**
 	 *
 	 */
-	public function testSignedCookie()
+	public function testSignedCookie(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -143,7 +143,7 @@ public function testSignedCookie()
 	/**
 	 *
 	 */
-	public function testI18n()
+	public function testI18n(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -163,7 +163,7 @@ public function testI18n()
 	/**
 	 *
 	 */
-	public function testHumanizer()
+	public function testHumanizer(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -183,7 +183,7 @@ public function testHumanizer()
 	/**
 	 *
 	 */
-	public function testUrl()
+	public function testUrl(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -203,7 +203,7 @@ public function testUrl()
 	/**
 	 *
 	 */
-	public function testPusher()
+	public function testPusher(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -227,7 +227,7 @@ public function testPusher()
 	/**
 	 *
 	 */
-	public function testSession()
+	public function testSession(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -247,7 +247,7 @@ public function testSession()
 	/**
 	 *
 	 */
-	public function testFlash()
+	public function testFlash(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -271,7 +271,7 @@ public function testFlash()
 	/**
 	 *
 	 */
-	public function testToken()
+	public function testToken(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -295,7 +295,7 @@ public function testToken()
 	/**
 	 *
 	 */
-	public function testOneTimeToken()
+	public function testOneTimeToken(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -319,7 +319,7 @@ public function testOneTimeToken()
 	/**
 	 *
 	 */
-	public function testGatekeeper()
+	public function testGatekeeper(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');
 
@@ -343,7 +343,7 @@ public function testGatekeeper()
 	/**
 	 *
 	 */
-	public function testUser()
+	public function testUser(): void
 	{
 		$mock = Mockery::mock('alias:mako\application\Application');