Merge branch '4.3' into 4.4

fabpot · fabpot · commit ead427378d55 · 2019-09-10T13:27:29.000+02:00
* 4.3:
  Remove Google references when not needed
  Simplify usage of dirname()
  Remove Google references when not needed
diff --git a/Resource/ComposerResource.php b/Resource/ComposerResource.php
@@ -60,7 +60,7 @@ private static function refresh()
         foreach (get_declared_classes() as $class) {
             if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
                 $r = new \ReflectionClass($class);
-                $v = \dirname(\dirname($r->getFileName()));
+                $v = \dirname($r->getFileName(), 2);
                 if (file_exists($v.'/composer/installed.json')) {
                     self::$runtimeVendors[$v] = @filemtime($v.'/composer/installed.json');
                 }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private static function refresh()`
`60`	`60`	`foreach (get_declared_classes() as $class) {`
`61`	`61`	`if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {`
`62`	`62`	`$r = new \ReflectionClass($class);`
`63`		`- $v = \dirname(\dirname($r->getFileName()));`
	`63`	`+ $v = \dirname($r->getFileName(), 2);`
`64`	`64`	`if (file_exists($v.'/composer/installed.json')) {`
`65`	`65`	`self::$runtimeVendors[$v] = @filemtime($v.'/composer/installed.json');`
`66`	`66`	`}`