From ec77a183067f6e3353640e052b22f21cd09e5bb3 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Tue, 20 Oct 2020 10:39:56 +0200
Subject: [PATCH 1/2] Travis > Test on PHP 7.4

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index cbb484db..170ca9d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 env:
   - dependencies=lowest
   - dependencies=highest

From d7e139e53e29c9cf88f6aca182e1d2bf6ddd7e68 Mon Sep 17 00:00:00 2001
From: Ruud Kamphuis <ruudk@users.noreply.github.com>
Date: Wed, 21 Oct 2020 14:04:25 +0200
Subject: [PATCH 2/2] Updated coding standard that can run on PHP 7.4

---
 composer.json                              |  6 +++---
 phpcs.xml                                  | 18 +++++++++++++++---
 src/Symfony/ConsoleApplicationResolver.php |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index b11f5874..5dc426af 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     "symfony/framework-bundle": "<3.0"
   },
   "require-dev": {
-    "consistence/coding-standard": "^3.0.1",
+    "consistence/coding-standard": "^3.10",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
     "ergebnis/composer-normalize": "^2.0.2",
     "phing/phing": "^2.16.0",
@@ -29,8 +29,8 @@
     "phpstan/phpstan-phpunit": "^0.12.8",
     "phpstan/phpstan-strict-rules": "^0.12.2",
     "phpunit/phpunit": "^7.5.20",
-    "slevomat/coding-standard": "^4.5.2",
-    "squizlabs/php_codesniffer": "^3.3.2",
+    "slevomat/coding-standard": "^6.4",
+    "squizlabs/php_codesniffer": "^3.5.6",
     "symfony/console": "^4.0",
     "symfony/framework-bundle": "^4.0",
     "symfony/http-foundation": "^4.0",
diff --git a/phpcs.xml b/phpcs.xml
index 2a8022a0..e551d322 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,7 @@
         <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
         <exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions"/>
         <exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
         <exclude name="Consistence.Exceptions.ExceptionDeclaration"/>
         <exclude name="Squiz.Commenting.FunctionComment.MissingParamTag"/>
     </rule>
@@ -20,7 +20,7 @@
             <property name="newlinesCountBetweenOpenTagAndDeclare" value="0"/>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
         <properties>
             <property name="usefulAnnotations" type="array" value="
                 @dataProvider,
@@ -28,8 +28,20 @@
             "/>
         </properties>
     </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
+        <properties>
+            <property name="enableNativeTypeHint" value="false"/>
+        </properties>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
+        <properties>
+            <property name="enableObjectTypeHint" value="false"/>
+        </properties>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
+    </rule>
     <rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
-    <rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
+    <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>
diff --git a/src/Symfony/ConsoleApplicationResolver.php b/src/Symfony/ConsoleApplicationResolver.php
index 9a684d17..88ee908f 100644
--- a/src/Symfony/ConsoleApplicationResolver.php
+++ b/src/Symfony/ConsoleApplicationResolver.php
@@ -25,7 +25,7 @@ public function __construct(?string $consoleApplicationLoader)
 
 	/**
 	 * @return \Symfony\Component\Console\Application|null
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
+	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
 	 */
 	private function loadConsoleApplication(string $consoleApplicationLoader)
 	{