From 89a60e0e4942e48904999ec75cec782ba3fe03cf Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Mon, 8 Aug 2016 16:13:53 +0200 Subject: [PATCH] Removed obsolete code --- .../install/files/acp/templates/packageStartInstall.tpl | 3 --- .../lib/system/cli/command/PackageCLICommand.class.php | 5 ----- .../files/lib/system/package/PackageArchive.class.php | 9 ++------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl index ab51fafb2d..82399ff468 100644 --- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl +++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl @@ -89,9 +89,6 @@ {if $errorType == 'empty'} {lang}wcf.global.form.error.empty{/lang} - {elseif $errorType == 'phpRequirements'} - {* todo: use language variable (-> else) *} -
{$phpRequirements|print_r}
{else} {lang}wcf.acp.package.error.{@$errorType}{/lang} {/if} diff --git a/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php b/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php index 5bd08ff739..ba3ec95b8f 100644 --- a/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php +++ b/wcfsetup/install/files/lib/system/cli/command/PackageCLICommand.class.php @@ -108,11 +108,6 @@ class PackageCLICommand implements IArgumentedCLICommand { catch (SystemException $e) { $this->error('noValidPackage'); } - $errors = PackageInstallationDispatcher::validatePHPRequirements($archive->getPhpRequirements()); - if (!empty($errors)) { - // TODO: Nice output - $this->error('phpRequirements', ['errors' => $errors]); - } // try to find existing package $sql = "SELECT * diff --git a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php index efd170bb27..687b4a94a9 100644 --- a/wcfsetup/install/files/lib/system/package/PackageArchive.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageArchive.class.php @@ -75,12 +75,6 @@ class PackageArchive { 'update' => [] ]; - /** - * list of php requirements - * @var mixed[][] - */ - protected $phpRequirements = []; - /** * default name of the package.xml file * @var string @@ -832,8 +826,9 @@ class PackageArchive { * Returns a list of php requirements for current package. * * @return mixed[][] + * @deprecated 3.0 */ public function getPhpRequirements() { - return $this->phpRequirements; + return []; } } -- 2.20.1