X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FZip.php;h=edcef5a720ae5f752e7964e1b57f7bebd4259ae6;hb=a2366db066c413d41194dfcfb82801db6e7371cb;hp=df0aca9190b8facbfb63639dbcc6aedb22850036;hpb=24704c73fe5f5ee2ca19a9fc98101841ee7c854a;p=civicrm-core.git

diff --git a/CRM/Utils/Zip.php b/CRM/Utils/Zip.php
index df0aca9190..edcef5a720 100644
--- a/CRM/Utils/Zip.php
+++ b/CRM/Utils/Zip.php
@@ -1,34 +1,18 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ | Copyright CiviCRM LLC. All rights reserved.                        |
  |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
 /**
@@ -44,7 +28,7 @@ class CRM_Utils_Zip {
    * @return mixed
    *   FALSE if #root level items !=1; otherwise, the name of base dir
    */
-  static public function findBaseDirName(ZipArchive $zip) {
+  public static function findBaseDirName(ZipArchive $zip) {
     $cnt = $zip->numFiles;
 
     $base = FALSE;
@@ -77,9 +61,9 @@ class CRM_Utils_Zip {
    * @return array(string)
    *   no trailing /
    */
-  static public function findBaseDirs(ZipArchive $zip) {
+  public static function findBaseDirs(ZipArchive $zip) {
     $cnt = $zip->numFiles;
-    $basedirs = array();
+    $basedirs = [];
 
     for ($i = 0; $i < $cnt; $i++) {
       $filename = $zip->getNameIndex($i);
@@ -101,7 +85,7 @@ class CRM_Utils_Zip {
    * @return string|bool
    *   Return string or FALSE
    */
-  static public function guessBasedir(ZipArchive $zip, $expected) {
+  public static function guessBasedir(ZipArchive $zip, $expected) {
     $candidate = FALSE;
     $basedirs = CRM_Utils_Zip::findBaseDirs($zip);
     if (in_array($expected, $basedirs)) {
@@ -118,7 +102,6 @@ class CRM_Utils_Zip {
     }
   }
 
-
   /**
    * An inefficient helper for creating a ZIP file from data in memory.
    * This is only intended for building temp files for unit-testing.
@@ -131,7 +114,7 @@ class CRM_Utils_Zip {
    *   Array, keys are file names and values are file contents.
    * @return bool
    */
-  static public function createTestZip($zipName, $dirs, $files) {
+  public static function createTestZip($zipName, $dirs, $files) {
     $zip = new ZipArchive();
     $res = $zip->open($zipName, ZipArchive::CREATE);
     if ($res === TRUE) {