make sure recording information works consistent across OS (line deli…

…ms) (#374) Co-authored-by: Markus Staab <[email protected]>
staabm · May 23, 2022 · 2011d67 · 2011d67
1 parent 3b7761e
commit 2011d67
Show file tree

Hide file tree

Showing 26 changed files with 6,536 additions and 11,945 deletions.
diff --git a/.phpstan-dba-mysqli.cache b/.phpstan-dba-mysqli.cache
diff --git a/.phpstan-dba-pdo.cache b/.phpstan-dba-pdo.cache
diff --git a/src/QueryReflection/QueryReflection.php b/src/QueryReflection/QueryReflection.php
@@ -130,18 +130,26 @@ public function resolveQueryStrings(Expr $queryExpr, Scope $scope): iterable
 
         if ($type instanceof UnionType) {
             foreach (TypeUtils::getConstantStrings($type) as $constantString) {
-                yield $constantString->getValue();
+                yield $this->normalizeQueryString($constantString->getValue());
             }
 
             return;
         }
 
         $queryString = $this->resolveQueryExpr($queryExpr, $scope);
         if (null !== $queryString) {
-            yield $queryString;
+            yield $this->normalizeQueryString($queryString);
         }
     }
 
+    /**
+     * Make sure query string work consistently across operating systems.
+     */
+    private function normalizeQueryString(string $queryString): string
+    {
+        return str_replace("\r\n", "\n", $queryString);
+    }
+
     /**
      * @deprecated use resolveQueryStrings() instead
      *

diff --git a/src/QueryReflection/ReflectionCache.php b/src/QueryReflection/ReflectionCache.php
@@ -13,7 +13,7 @@
 
 final class ReflectionCache
 {
-    public const SCHEMA_VERSION = 'v6-schema-hash';
+    public const SCHEMA_VERSION = 'v7-normalized-eol';
 
     /**
      * @var string

diff --git a/tests/default/DbaInferenceTest.php b/tests/default/DbaInferenceTest.php
@@ -62,6 +62,7 @@ public function dataFileAsserts(): iterable
 
         yield from $this->gatherAssertTypes(__DIR__.'/data/pdo-union-result.php');
         yield from $this->gatherAssertTypes(__DIR__.'/data/mysqli-union-result.php');
+        yield from $this->gatherAssertTypes(__DIR__.'/data/bug372.php');
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,7 @@ public function dataFileAsserts(): iterable @@
             yield from $this->gatherAssertTypes(__DIR__.'/data/pdo-union-result.php');
             yield from $this->gatherAssertTypes(__DIR__.'/data/mysqli-union-result.php');
+            yield from $this->gatherAssertTypes(__DIR__.'/data/bug372.php');
         }
         /**
@@ Expand Down @@