[BUGFIX] Make call to isPackageKeyValid non-static 49/31749/4
authorPeter Niederlag <peter.niederlag@typo3.org>
Thu, 24 Jul 2014 10:50:24 +0000 (12:50 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 24 Jul 2014 18:38:04 +0000 (20:38 +0200)
Function isPackagKeyValid on PackageManeger is not a static function
and must be called on an object instance.

Resolves: #59619
Releases: 6.3, 6.2
Change-Id: I03b068db00ccdf76b6e8658721e630b7de6ebfd8
Reviewed-on: http://review.typo3.org/31749
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/core/Classes/Package/Package.php

index a1ff6cc..2d6ec5d 100644 (file)
@@ -70,7 +70,7 @@ class Package extends \TYPO3\Flow\Package\Package implements PackageInterface {
         * @throws \TYPO3\Flow\Package\Exception\InvalidPackageManifestException if no composer manifest file could be found
         */
        public function __construct(\TYPO3\Flow\Package\PackageManager $packageManager, $packageKey, $packagePath, $classesPath = NULL, $manifestPath = '') {
-               if (!\TYPO3\CMS\Core\Package\PackageManager::isPackageKeyValid($packageKey)) {
+               if (!$packageManager->isPackageKeyValid($packageKey)) {
                        throw new \TYPO3\Flow\Package\Exception\InvalidPackageKeyException('"' . $packageKey . '" is not a valid package key.', 1217959511);
                }
                if (!(@is_dir($packagePath) || (\TYPO3\Flow\Utility\Files::is_link($packagePath) && is_dir(\TYPO3\Flow\Utility\Files::getNormalizedPath($packagePath))))) {