From 1cd5b73426145ccf061ff6f5370fdb974ac27368 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Thu, 16 Sep 2021 18:23:32 -0700
Subject: [PATCH] Remove suppression for MissingNativeTypeHint errors

---
 phpcs.xml.dist                      | 8 --------
 src/Connection.php                  | 2 +-
 src/Driver/OCI8/Connection.php      | 3 +++
 src/Platforms/SQLServerPlatform.php | 5 +----
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 730257c797c..b181bb0bb66 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -48,14 +48,6 @@
         <exclude-pattern>*/src/Tools/Console/Helper/ConnectionHelper.php</exclude-pattern>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>*/src/*</exclude-pattern>
-    </rule>
-
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
-        <exclude-pattern>*/src/*</exclude-pattern>
-    </rule>
-
     <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
         <exclude-pattern>*/lib/Doctrine/DBAL/Driver/PDOQueryImplementation.php</exclude-pattern>
         <exclude-pattern>*/lib/Doctrine/DBAL/Driver/PDOStatementImplementations.php</exclude-pattern>
diff --git a/src/Connection.php b/src/Connection.php
index 453a04dfcff..dfaa0059fe8 100644
--- a/src/Connection.php
+++ b/src/Connection.php
@@ -619,7 +619,7 @@ public function insert(string $table, array $data, array $types = []): int
      *
      * @return array<int, int|string|Type|null>|array<string, int|string|Type|null>
      */
-    private function extractTypeValues(array $columnList, array $types)
+    private function extractTypeValues(array $columnList, array $types): array
     {
         $typeValues = [];
 
diff --git a/src/Driver/OCI8/Connection.php b/src/Driver/OCI8/Connection.php
index e091d5ae2e8..70aa63b5214 100644
--- a/src/Driver/OCI8/Connection.php
+++ b/src/Driver/OCI8/Connection.php
@@ -94,6 +94,9 @@ public function exec(string $sql): int
         return $this->prepare($sql)->execute()->rowCount();
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function lastInsertId()
     {
         throw IdentityColumnsNotSupported::new();
diff --git a/src/Platforms/SQLServerPlatform.php b/src/Platforms/SQLServerPlatform.php
index 22ac067fca2..3e0fa7b1871 100644
--- a/src/Platforms/SQLServerPlatform.php
+++ b/src/Platforms/SQLServerPlatform.php
@@ -1473,10 +1473,7 @@ public function getListTableMetadataSQL(string $table): string
         );
     }
 
-    /**
-     * @param string $query
-     */
-    private function shouldAddOrderBy($query): bool
+    private function shouldAddOrderBy(string $query): bool
     {
         // Find the position of the last instance of ORDER BY and ensure it is not within a parenthetical statement
         // but can be in a newline