Merge pull request #23 from doctrine/GH-20-FixConditionForTestsFolder

[GH-20] Fix tests condition for detecting outside/inside code and imp…

composer.json

@@ -20,8 +20,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "DeprecationTests\\": "tests/fixtures/src",
-            "Doctrine\\Foo\\": "tests/fixtures/vendor/doctrine/foo"
+            "DeprecationTests\\": "test_fixtures/src",
+            "Doctrine\\Foo\\": "test_fixtures/vendor/doctrine/foo"
         }
     }
 }

lib/Doctrine/Deprecations/Deprecation.php

@@ -108,15 +108,15 @@ public static function triggerIfCalledFromOutside(string $package, string $link,
         // dependency and the caller is not a file in that package.
         // When $package is installed as a root package, then this deprecation
         // is always ignored
-        if (
-            strpos($backtrace[0]['file'], '/vendor/' . $package . '/') === false &&
-            strpos($backtrace[1]['file'], '/tests/') !== false
-        ) {
-            return;
-        }
-
-        if (strpos($backtrace[1]['file'], '/vendor/' . $package . '/') !== false) {
-            return;
+        // first check that the caller is not from a tests folder, in which case we always let deprecations pass
+        if (strpos($backtrace[1]['file'], '/tests/') === false) {
+            if (strpos($backtrace[0]['file'], '/vendor/' . $package . '/') === false) {
+                return;
+            }
+
+            if (strpos($backtrace[1]['file'], '/vendor/' . $package . '/') !== false) {
+                return;
+            }
         }
 
         if (array_key_exists($link, self::$ignoredLinks)) {

test_fixtures/src/RootDeprecation.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace DeprecationTests;
+
+use Doctrine\Deprecations\Deprecation;
+
+class RootDeprecation
+{
+    public static function run()
+    {
+        Deprecation::triggerIfCalledFromOutside(
+            'doctrine/orm',
+            'https://github.com/doctrine/deprecations/4444',
+            'this is deprecated %s %d',
+            'foo',
+            1234
+        );
+
+    }
+}

tests/Doctrine/Deprecations/DeprecationTest.php

@@ -5,6 +5,7 @@
 namespace Doctrine\Deprecations;
 
 use DeprecationTests\Foo;
+use DeprecationTests\RootDeprecation;
 use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use Doctrine\Foo\Baz;
 use PHPUnit\Framework\Error\Deprecated;
@@ -229,24 +230,18 @@ public function testDeprecationCalledFromOutsideInRoot(): void
         Deprecation::enableWithTriggerError();
 
         $this->expectDeprecation();
-        $this->expectDeprecationMessage('this is deprecated foo 1234 (DeprecationTest.php');
+        $this->expectDeprecationMessage('this is deprecated foo 1234 (RootDeprecation.php');
 
         $this->expectDeprecationWithIdentifier('https://github.com/doctrine/deprecations/4444');
 
         $e = null;
         try {
-            Deprecation::triggerIfCalledFromOutside(
-                'doctrine/orm',
-                'https://github.com/doctrine/deprecations/4444',
-                'this is deprecated %s %d',
-                'foo',
-                1234
-            );
+            RootDeprecation::run();
 
             $this->fail('Should never be reached because of deprecation exception');
         } catch (Throwable $e) {
             $this->assertStringMatchesFormat(
-                'this is deprecated foo 1234 (DeprecationTest.php:%d called by TestCase.php:%d, https://github.com/doctrine/deprecations/4444, package doctrine/orm)',
+                'this is deprecated foo 1234 (RootDeprecation.php:%d called by DeprecationTest.php:%d, https://github.com/doctrine/deprecations/4444, package doctrine/orm)',
                 $e->getMessage()
             );
             $this->assertEquals(1, Deprecation::getUniqueTriggeredDeprecationsCount());