Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-21 22:18:03 +01:00
Code Issues Packages Projects Releases Activity

PSR fixes

Browse Source
This commit is contained in:
Andy Miller
2015-02-18 12:36:30 -07:00
parent e0de6f8b5f
commit 127fe7fa2a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
system/src/Grav/Common/GPM/Installer.php
View File

@@ -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);