Zend_Search_Lucene: Update of Zip extension status processing. ZF-8401.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19630 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Search/Lucene/Document/Docx.php

@@ -23,8 +23,6 @@
 /** Zend_Search_Lucene_Document_OpenXml */
 require_once 'Zend/Search/Lucene/Document/OpenXml.php';
 
-if (class_exists('ZipArchive', false)) {
-
 /**
  * Docx document.
  *
@@ -50,6 +48,11 @@ class Zend_Search_Lucene_Document_Docx extends Zend_Search_Lucene_Document_OpenX
      * @throws Zend_Search_Lucene_Exception
      */
     private function __construct($fileName, $storeContent) {
+        if (!class_exists('ZipArchive', false)) {
+            require_once 'Zend/Search/Lucene/Exception.php';
+            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
+        }
+
         // Document data holders
         $documentBody = array();
         $coreProperties = array();
@@ -146,5 +149,3 @@ class Zend_Search_Lucene_Document_Docx extends Zend_Search_Lucene_Document_OpenX
         return new Zend_Search_Lucene_Document_Docx($fileName, $storeContent);
     }
 }
-
-} // end if (class_exists('ZipArchive'))

library/Zend/Search/Lucene/Document/OpenXml.php

@@ -25,8 +25,6 @@
 require_once 'Zend/Search/Lucene/Document.php';
 
 
-if (class_exists('ZipArchive', false)) {
-
 /**
  * OpenXML document.
  *
@@ -129,5 +127,3 @@ abstract class Zend_Search_Lucene_Document_OpenXml extends Zend_Search_Lucene_Do
         return implode('/', $absolutes);
     }
 }
-
-} // end if (class_exists('ZipArchive'))

library/Zend/Search/Lucene/Document/Pptx.php

@@ -24,8 +24,6 @@
 /** Zend_Search_Lucene_Document_OpenXml */
 require_once 'Zend/Search/Lucene/Document/OpenXml.php';
 
-if (class_exists('ZipArchive', false)) {
-
 /**
  * Pptx document.
  *
@@ -74,6 +72,11 @@ class Zend_Search_Lucene_Document_Pptx extends Zend_Search_Lucene_Document_OpenX
      */
     private function __construct($fileName, $storeContent)
     {
+        if (!class_exists('ZipArchive', false)) {
+            require_once 'Zend/Search/Lucene/Exception.php';
+            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
+        }
+
         // Document data holders
         $slides = array();
         $slideNotes = array();
@@ -195,5 +198,3 @@ class Zend_Search_Lucene_Document_Pptx extends Zend_Search_Lucene_Document_OpenX
         return new Zend_Search_Lucene_Document_Pptx($fileName, $storeContent);
     }
 }
-
-} // end if (class_exists('ZipArchive'))

library/Zend/Search/Lucene/Document/Xlsx.php

@@ -24,8 +24,6 @@
 /** Zend_Search_Lucene_Document_OpenXml */
 require_once 'Zend/Search/Lucene/Document/OpenXml.php';
 
-if (class_exists('ZipArchive', false)) {
-
 /**
  * Xlsx document.
  *
@@ -81,6 +79,11 @@ class Zend_Search_Lucene_Document_Xlsx extends Zend_Search_Lucene_Document_OpenX
      */
     private function __construct($fileName, $storeContent)
     {
+        if (!class_exists('ZipArchive', false)) {
+            require_once 'Zend/Search/Lucene/Exception.php';
+            throw new Zend_Search_Lucene_Exception('MS Office documents processing functionality requires Zip extension to be loaded');
+        }
+
         // Document data holders
         $sharedStrings = array();
         $worksheets = array();
@@ -258,5 +261,3 @@ class Zend_Search_Lucene_Document_Xlsx extends Zend_Search_Lucene_Document_OpenX
         return new Zend_Search_Lucene_Document_Xlsx($fileName, $storeContent);
     }
 }
-
-} // end if (class_exists('ZipArchive'))