style: enhance getTestedVersion

Author: PROFeNoM

tests/Common/IntegrationTestCase.php

@@ -143,7 +143,24 @@ protected static function getTestedVersion($testedLibrary)
                     $version = trim($output[0]);
                 }
             }
-        } else {
+        } elseif (($workingDir = static::getAppIndexScript()) || ($workingDir = static::getConsoleScript())) {
+            do {
+                $workingDir = dirname($workingDir);
+                $composer = $workingDir . '/composer.json';
+            } while (!file_exists($composer) && basename($workingDir) !== 'tests'); // there is no reason to go further up
+
+            if (!file_exists($composer)) {
+                return null;
+            }
+
+            $output = [];
+            $command = "composer show $testedLibrary --working-dir=$workingDir | sed -n '/versions/s/^[^0-9]\+\([^,]\+\).*$/\\1/p'";
+            exec($command, $output, $returnVar);
+
+            if ($returnVar === 0) {
+                $version = trim($output[0]);
+            }
+        } elseif (\Composer\InstalledVersions::isInstalled($testedLibrary)) {
             $version = \Composer\InstalledVersions::getVersion($testedLibrary);
             $version = preg_replace('/^(\d+\.\d+\.\d+).*/', '$1', $version);
         }
@@ -187,4 +204,19 @@ public function assertOneSpan($traces, SpanAssertion $expectedSpan)
     {
         $this->assertOneExpectedSpan($traces, $expectedSpan);
     }
+
+    public static function getConsoleScript()
+    {
+        return null;
+    }
+
+    /**
+     * Returns the application index.php file full path.
+     *
+     * @return string|null
+     */
+    public static function getAppIndexScript()
+    {
+        return null;
+    }
 }

tests/Common/WebFrameworkTestCase.php

@@ -76,16 +76,6 @@ protected function ddTearDown()
         parent::ddTearDown();
     }
 
-    /**
-     * Returns the application index.php file full path.
-     *
-     * @return string|null
-     */
-    public static function getAppIndexScript()
-    {
-        return null;
-    }
-
     protected static function getRoadrunnerVersion()
     {
         return null;
@@ -292,28 +282,4 @@ protected function sendRequest($method, $url, $headers = [], $body = [], $change
 
         return $response;
     }
-
-    protected static function getTestedVersion($testedLibrary)
-    {
-        $workingDir = static::getAppIndexScript();
-        do {
-            $workingDir = dirname($workingDir);
-            $composer = $workingDir . '/composer.json';
-        } while (!file_exists($composer) && basename($workingDir) !== 'tests'); // there is no reason to go further up
-
-        if (!file_exists($composer)) {
-            return null;
-        }
-
-        $output = [];
-        $returnVar = 0;
-        $command = "composer show $testedLibrary --working-dir=$workingDir | sed -n '/versions/s/^[^0-9]\+\([^,]\+\).*$/\\1/p'";
-        exec($command, $output, $returnVar);
-
-        if ($returnVar !== 0) {
-            return null;
-        }
-
-        return trim($output[0]);
-    }
 }

tests/Integrations/Logs/BaseLogsTest.php

@@ -8,11 +8,6 @@
 
 class BaseLogsTest extends \DDTrace\Tests\Common\IntegrationTestCase
 {
-    public static function getTestedLibrary()
-    {
-        return 'monolog/monolog';
-    }
-
     protected static function logFile()
     {
         return "/tmp/test-" . substr(static::class, strrpos(static::class, '\\') + 1) . '.log';