Support libarchive < 3.5.0

Author: cataphract

libarchive.c

@@ -286,9 +286,13 @@ static void arch_obj_setup_support(arch_object *arch_obj)
     if (arch_obj->filters == NULL) {
         archive_read_support_filter_all(arch_obj->archive);
     } else {
+#if ARCHIVE_VERSION_NUMBER >= 3005000
         for (uint32_t i = 0; i < arch_obj->filters_count; i++) {
             archive_read_support_filter_by_code(arch_obj->archive, arch_obj->filters[i]);
         }
+#else
+        archive_read_support_filter_all(arch_obj->archive);
+#endif
     }
     if (arch_obj->formats == NULL) {
         archive_read_support_format_all(arch_obj->archive);
@@ -455,6 +459,11 @@ PHP_METHOD(libarchive_Archive, supportFilters)
                 "Cannot change filter after archive has been opened", -1);
         return;
     }
+#if ARCHIVE_VERSION_NUMBER < 3005000
+    php_error_docref(NULL, E_WARNING,
+            "supportFilters() requires libarchive >= 3.5.0; all filters will be enabled");
+    RETURN_THIS();
+#endif
     efree(arch_obj->filters);
     arch_obj->filters = safe_emalloc(num_args, sizeof(int), 0);
     arch_obj->filters_count = num_args;

libarchive.stub.php

@@ -4,6 +4,9 @@
 
 namespace libarchive {
 
+    /** @var int
+     * @cvalue ARCHIVE_VERSION_NUMBER */ const LIBARCHIVE_VERSION_ID = UNKNOWN;
+
     /** @var int
      * @cvalue ARCHIVE_FILTER_NONE */ const FILTER_NONE = UNKNOWN;
     /** @var int

libarchive_arginfo.h

@@ -73,6 +73,7 @@ static const zend_function_entry class_libarchive_Archive_methods[] = {
 
 static void register_libarchive_symbols(int module_number)
 {
+	REGISTER_LONG_CONSTANT("libarchive\\LIBARCHIVE_VERSION_ID", ARCHIVE_VERSION_NUMBER, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("libarchive\\FILTER_NONE", ARCHIVE_FILTER_NONE, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("libarchive\\FILTER_GZIP", ARCHIVE_FILTER_GZIP, CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("libarchive\\FILTER_BZIP2", ARCHIVE_FILTER_BZIP2, CONST_PERSISTENT);

tests/support-formats-filters.phpt

@@ -1,5 +1,10 @@
 --TEST--
 supportFormats() and supportFilters() restrict archive format and filter detection
+--SKIPIF--
+<?php
+if (!extension_loaded('archive')) die('skip archive extension not loaded');
+if (\libarchive\LIBARCHIVE_VERSION_ID < 3005000) die('skip requires libarchive >= 3.5.0');
+?>
 --FILE--
 <?php