Merge pull request #96 from benjaminkott/patch-1

helhum · web-flow · commit 707dc47476b9 · 2020-10-23T15:53:46.000+02:00
diff --git a/src/Plugin/Util/ExtensionKeyResolver.php b/src/Plugin/Util/ExtensionKeyResolver.php
@@ -36,6 +36,7 @@ public static function resolve(PackageInterface $package, IOInterface $io = null
         if (strpos($package->getType(), 'typo3-cms-') === false) {
             throw new \RuntimeException(sprintf('Tried to resolve an extension key from non extension package "%s"', $package->getName()), 1501195043);
         }
+        $extra = $package->getExtra();
         if (!empty($extra['typo3/cms']['extension-key'])) {
             return $extra['typo3/cms']['extension-key'];
         }
@@ -60,7 +61,6 @@ public static function resolve(PackageInterface $package, IOInterface $io = null
             list(, $extensionKey) = explode('/', $package->getName(), 2);
             $extensionKey = str_replace('-', '_', $extensionKey);
         }
-        $extra = $package->getExtra();
         if (!empty($extra['installer-name'])) {
             $extensionKey = $extra['installer-name'];
         }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public static function resolve(PackageInterface $package, IOInterface $io = null`
`36`	`36`	`if (strpos($package->getType(), 'typo3-cms-') === false) {`
`37`	`37`	`throw new \RuntimeException(sprintf('Tried to resolve an extension key from non extension package "%s"', $package->getName()), 1501195043);`
`38`	`38`	`}`
	`39`	`+ $extra = $package->getExtra();`
`39`	`40`	`if (!empty($extra['typo3/cms']['extension-key'])) {`
`40`	`41`	`return $extra['typo3/cms']['extension-key'];`
`41`	`42`	`}`
`@@ -60,7 +61,6 @@ public static function resolve(PackageInterface $package, IOInterface $io = null`
`60`	`61`	`list(, $extensionKey) = explode('/', $package->getName(), 2);`
`61`	`62`	`$extensionKey = str_replace('-', '_', $extensionKey);`
`62`	`63`	`}`
`63`		`- $extra = $package->getExtra();`
`64`	`64`	`if (!empty($extra['installer-name'])) {`
`65`	`65`	`$extensionKey = $extra['installer-name'];`
`66`	`66`	`}`