Merge pull request #63 from raziel057/fix-path-windows

Fix path on windows
doctrine · Sep 27, 2023 · 4f2d4f2 · 4f2d4f2
2 parents bdaa697 + 53bd463
commit 4f2d4f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Doctrine/Deprecations/Deprecation.php b/lib/Doctrine/Deprecations/Deprecation.php
@@ -11,6 +11,7 @@
 use function assert;
 use function debug_backtrace;
 use function sprintf;
+use function str_replace;
 use function strpos;
 use function strrpos;
 use function substr;
@@ -138,7 +139,7 @@ public static function triggerIfCalledFromOutside(string $package, string $link,
 
         // first check that the caller is not from a tests folder, in which case we always let deprecations pass
         if (isset($backtrace[1]['file'], $backtrace[0]['file']) && strpos($backtrace[1]['file'], DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR) === false) {
-            $path = DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR;
+            $path = DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $package) . DIRECTORY_SEPARATOR;
 
             if (strpos($backtrace[0]['file'], $path) === false) {
                 return;

diff --git a/tests/Doctrine/Deprecations/DeprecationTest.php b/tests/Doctrine/Deprecations/DeprecationTest.php
@@ -234,6 +234,8 @@ public function testDeprecationIfCalledFromOutside(): void
         );
 
         Foo::triggerDependencyWithDeprecation();
+
+        $this->assertEquals(1, Deprecation::getUniqueTriggeredDeprecationsCount());
     }
 
     public function testDeprecationIfCalledFromOutsideNotTriggeringFromInside(): void
-Original file line number
+Diff line change
@@ Expand Up / @@ -234,6 +234,8 @@ public function testDeprecationIfCalledFromOutside(): void @@
             );
             Foo::triggerDependencyWithDeprecation();
+            $this->assertEquals(1, Deprecation::getUniqueTriggeredDeprecationsCount());
         }
         public function testDeprecationIfCalledFromOutsideNotTriggeringFromInside(): void
@@ Expand Down @@