Commit 140cbcdf authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'feature/require-ext-zip' into 'develop'

[TASK] Require ext-zip (and remove runtime checks)

See merge request t3o/ter!566
parents 00ef09c5 3f957ae1
Pipeline #9566 failed with stages
in 8 minutes and 16 seconds
......@@ -30,6 +30,7 @@
"ext-dom": "*",
"ext-json": "*",
"ext-pdo": "*",
"ext-zip": "*",
"ext-zlib": "*",
"apache-solr-for-typo3/solr": "^11.0",
"gordalina/cachetool": "^4.0",
......
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "856a08e8648bbc89fb59b79ef5b86f36",
"content-hash": "b7ae3aa91017ceee5b039dfa36b54741",
"packages": [
{
"name": "adoy/fastcgi-client",
......@@ -8985,6 +8985,7 @@
"ext-dom": "*",
"ext-json": "*",
"ext-pdo": "*",
"ext-zip": "*",
"ext-zlib": "*"
},
"platform-dev": [],
......
......@@ -34,10 +34,6 @@ class ArchiveUtility
*/
public static function createZipArchive($filename, array $files, $overwrite = false)
{
if (!class_exists('ZipArchive')) {
throw new \Exception('Please make sure that php zip extension is installed');
}
// Check if file already exists
if (!$overwrite && \T3o\TerFe2\Utility\FileUtility::fileExists($filename)) {
return true;
......@@ -79,10 +75,6 @@ class ArchiveUtility
*/
public static function extractZipArchive($filename, $path, $files = null)
{
if (!class_exists('ZipArchive')) {
throw new \Exception('Please make sure that php zip extension is installed');
}
// Check if file exists
if (!\T3o\TerFe2\Utility\FileUtility::fileExists($filename)) {
throw new \Exception('File "' . $filename . '" not found to extract');
......@@ -122,10 +114,6 @@ class ArchiveUtility
*/
public static function getZipArchiveContent($filename)
{
if (!class_exists('ZipArchive')) {
throw new \Exception('Please make sure that php zip extension is installed');
}
// Check if file exists
if (!\T3o\TerFe2\Utility\FileUtility::fileExists($filename)) {
throw new \Exception('File "' . $filename . '" not found to extract');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment