Skip to content

Commit f825ef5

Browse files
committed
Reorder code
1 parent 0a8c3d6 commit f825ef5

File tree

1 file changed

+25
-26
lines changed

1 file changed

+25
-26
lines changed

src/PhpWord/Shared/ZipArchive.php

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ public function __construct()
8989
define('PCLZIP_TEMPORARY_DIR', sys_get_temp_dir() . '/');
9090
}
9191
require_once 'PCLZip/pclzip.lib.php';
92-
} else {
93-
$this->zip = new \ZipArchive();
9492
}
9593
}
9694

@@ -120,6 +118,31 @@ public function __call($function, $args)
120118
return $result;
121119
}
122120

121+
/**
122+
* Open a new zip archive
123+
*
124+
* @param string $filename The file name of the ZIP archive to open
125+
* @param int $flags The mode to use to open the archive
126+
* @return bool
127+
*/
128+
public function open($filename, $flags = null)
129+
{
130+
$result = true;
131+
$this->filename = $filename;
132+
133+
if (!$this->usePclzip) {
134+
$this->zip = new \ZipArchive();
135+
$result = $this->zip->open($this->filename, $flags);
136+
$this->numFiles = $this->zip->numFiles;
137+
} else {
138+
$this->zip = new \PclZip($this->filename);
139+
$this->tempDir = sys_get_temp_dir();
140+
$this->numFiles = count($this->zip->listContent());
141+
}
142+
143+
return $result;
144+
}
145+
123146
/**
124147
* Close the active archive
125148
*
@@ -158,30 +181,6 @@ public function extractTo($destination, $entries = null)
158181
}
159182
}
160183

161-
/**
162-
* Open a new zip archive
163-
*
164-
* @param string $filename The file name of the ZIP archive to open
165-
* @param int $flags The mode to use to open the archive
166-
* @return bool
167-
*/
168-
public function open($filename, $flags = null)
169-
{
170-
$result = true;
171-
$this->filename = $filename;
172-
173-
if (!$this->usePclzip) {
174-
$result = $this->zip->open($this->filename, $flags);
175-
$this->numFiles = $this->zip->numFiles;
176-
} else {
177-
$this->tempDir = sys_get_temp_dir();
178-
$this->zip = new \PclZip($this->filename);
179-
$this->numFiles = count($this->zip->listContent());
180-
}
181-
182-
return $result;
183-
}
184-
185184
/**
186185
* Extract file from archive by given file name (emulate \ZipArchive)
187186
*

0 commit comments

Comments
 (0)