diff --git a/.editorconfig b/.editorconfig
index 33703af..66e8240 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,18 @@
 root = true
+
 [*]
+charset = utf-8
+indent_style = tab
+indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+max_line_length = 120
+
+
+[**/*.json]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+trim_trailing_whitespace = true
diff --git a/.php_cs.dist b/.php_cs.dist
index c70ddbb..938937d 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -3,14 +3,16 @@
 $config = \PhpCsFixer\Config::create()
 	->setRiskyAllowed(true)
 	->setIndent("\t")
-	->setUsingCache(false)
+	->setCacheFile(__DIR__ . '/.php-cs-fixer.cache')
 	->setRules([
-		'@PHP56Migration' => true,
-		'@PHPUnit60Migration:risky' => true,
+		'@PHP74Migration' => true,
+		'@PHP74Migration:risky' => true,
+		'@PHP80Migration' => true,
+		'@PHP80Migration:risky' => true,
 		'@PhpCsFixer' => true,
 		'@PhpCsFixer:risky' => true,
-		'list_syntax' => ['syntax' => 'short'],
 		'@PSR2' => true,
+		'list_syntax' => ['syntax' => 'short'],
 		'align_multiline_comment' => true,
 		'array_syntax' => ['syntax' => 'short'],
 		'blank_line_after_namespace' => true,
@@ -27,6 +29,7 @@ $config = \PhpCsFixer\Config::create()
 		],
 		'explicit_string_variable' => false,
 		'declare_equal_normalize' => true,
+		'declare_strict_types' => false,
 		'dir_constant' => false,
 		'doctrine_annotation_braces' => true,
 		'doctrine_annotation_indentation' => true,
@@ -145,13 +148,14 @@ $config = \PhpCsFixer\Config::create()
 		'switch_case_space' => true,
 		'ternary_operator_spaces' => true,
 		'ternary_to_null_coalescing' => true,
-		'trailing_comma_in_multiline_array' => false,
+		'trailing_comma_in_multiline' => ['after_heredoc' => false, 'elements' => []],
 		'trim_array_spaces' => true,
 		'unary_operator_spaces' => true,
 		'visibility_required' => [
 			'property',
 			'method',
 		],
+		'void_return' => false,
 		'whitespace_after_comma_in_array' => true,
 	])
 	->setFinder(PhpCsFixer\Finder::create()