Use PathUtil to check if hook is in vendor dir

AlexejKossmann · Jul 10, 2020 · b5d4be1 · b5d4be1
1 parent 4328f77
commit b5d4be1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core-bundle/src/DataCollector/ContaoDataCollector.php b/core-bundle/src/DataCollector/ContaoDataCollector.php
@@ -23,6 +23,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DataCollector;
+use Webmozart\PathUtil\Path;
 
 /**
  * @internal
@@ -187,13 +188,12 @@ private function addLegacyRoutingData(): void
                 $class = $systemAdapter->importStatic($callback[0]);
                 $r = new \ReflectionClass($class);
                 $file = $r->getFileName();
-                $base = $this->parameterBag->get('kernel.project_dir').'/vendor/';
-                $baseLength = \strlen($base);
+                $vendorDir = $this->parameterBag->get('kernel.project_dir').'/vendor/';
 
                 $hook = ['name' => $name, 'class' => \get_class($class), 'method' => $callback[1], 'package' => ''];
 
-                if (0 === strncmp($file, $base, $baseLength)) {
-                    [$vendor, $package] = explode('/', substr($file, $baseLength), 3);
+                if (Path::isBasePath($vendorDir, $file)) {
+                    [$vendor, $package] = explode('/', Path::makeRelative($file, $vendorDir), 3);
                     $hook['package'] = $vendor.'/'.$package;
                 }