From 127fe7fa2aaeb594b7bd052d503fac01e7649938 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 18 Feb 2015 12:36:30 -0700 Subject: [PATCH] PSR fixes --- system/src/Grav/Common/GPM/Installer.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/system/src/Grav/Common/GPM/Installer.php b/system/src/Grav/Common/GPM/Installer.php index fca1042d3..49d713f04 100644 --- a/system/src/Grav/Common/GPM/Installer.php +++ b/system/src/Grav/Common/GPM/Installer.php @@ -61,15 +61,12 @@ class Installer $options = array_merge(self::$options, $options); $install_path = rtrim($destination . DS . ltrim($options['install_path'], DS), DS); - if (!self::isGravInstance($destination) || !self::isValidDestination($install_path, $options['exclude_checks']) - ) { + if (!self::isGravInstance($destination) || !self::isValidDestination($install_path, $options['exclude_checks'])) { return false; } - if ( - self::lastErrorCode() == self::IS_LINK && $options['ignore_symlinks'] || - self::lastErrorCode() == self::EXISTS && !$options['overwrite'] - ) { + if (self::lastErrorCode() == self::IS_LINK && $options['ignore_symlinks'] || + self::lastErrorCode() == self::EXISTS && !$options['overwrite']) { return false; } @@ -112,7 +109,7 @@ class Installer } - public static function nonSophisticatedInstall($zip, $install_path, $tmp) + public static function nonSophisticatedInstall(\ZipArchive $zip, $install_path, $tmp) { $container = $zip->getNameIndex(0); // TODO: better way of determining if zip has container folder if (file_exists($install_path)) { @@ -124,7 +121,7 @@ class Installer return true; } - public static function sophisticatedInstall($zip, $install_path, $tmp) + public static function sophisticatedInstall(\ZipArchive $zip, $install_path, $tmp) { for ($i = 0, $l = $zip->numFiles; $i < $l; $i++) { $filename = $zip->getNameIndex($i);