mirror/php-zip
1
0
Fork 0
mirror of https://github.com/Ne-Lexa/php-zip.git synced 2025-08-02 13:37:25 +02:00
Code Issues Releases Wiki Activity

cs fix

Browse Source
This commit is contained in:
wapplay
2018-10-21 19:30:45 +03:00
parent 837454ba7e
commit c9f597308e
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/PhpZip/Model/Entry/ZipNewFileEntry.php
View File

@@ -25,14 +25,14 @@ class ZipNewFileEntry extends ZipAbstractEntry
public function __construct($file) public function __construct($file)
{ {
parent::__construct(); parent::__construct();
if ($file === null){ if ($file === null) {
throw new InvalidArgumentException("file is null"); throw new InvalidArgumentException("file is null");
} }
$file = (string)$file; $file = (string)$file;
if (!is_file($file)){ if (!is_file($file)) {
throw new ZipException("File $file does not exist."); throw new ZipException("File $file does not exist.");
} }
if (!is_readable($file)){ if (!is_readable($file)) {
throw new ZipException("The '$file' file could not be read. Check permissions."); throw new ZipException("The '$file' file could not be read. Check permissions.");
} }
$this->file = $file; $this->file = $file;
@@ -45,9 +45,9 @@ class ZipNewFileEntry extends ZipAbstractEntry
*/ */
public function getEntryContent() public function getEntryContent()
{ {
if (!is_file($this->file)){ if (!is_file($this->file)) {
throw new RuntimeException("File {$this->file} does not exist."); throw new RuntimeException("File {$this->file} does not exist.");
} }
return file_get_contents($this->file); return file_get_contents($this->file);
} }
} }

8
src/PhpZip/ZipFile.php
View File

@@ -562,7 +562,7 @@ class ZipFile implements ZipFileInterface
throw new InvalidArgumentException('The input directory is not specified'); throw new InvalidArgumentException('The input directory is not specified');
} }
if (!is_dir($inputDir)) { if (!is_dir($inputDir)) {
throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir)); throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir));
} }
$inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR; $inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR;
@@ -594,7 +594,7 @@ class ZipFile implements ZipFileInterface
throw new InvalidArgumentException('The input directory is not specified'); throw new InvalidArgumentException('The input directory is not specified');
} }
if (!is_dir($inputDir)) { if (!is_dir($inputDir)) {
throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir)); throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir));
} }
$inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR; $inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR;
@@ -713,7 +713,7 @@ class ZipFile implements ZipFileInterface
throw new InvalidArgumentException('The input directory is not specified'); throw new InvalidArgumentException('The input directory is not specified');
} }
if (!is_dir($inputDir)) { if (!is_dir($inputDir)) {
throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir)); throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir));
} }
$globPattern = (string)$globPattern; $globPattern = (string)$globPattern;
if (empty($globPattern)) { if (empty($globPattern)) {
@@ -813,7 +813,7 @@ class ZipFile implements ZipFileInterface
throw new InvalidArgumentException('The input directory is not specified'); throw new InvalidArgumentException('The input directory is not specified');
} }
if (!is_dir($inputDir)) { if (!is_dir($inputDir)) {
throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir)); throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.', $inputDir));
} }
$inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR; $inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR;

14
tests/PhpZip/Issue24Test.php
View File

@@ -53,7 +53,7 @@ class DummyFileSystemStream
*/ */
private $fp; private $fp;
function stream_open($path, $mode, $options, &$opened_path) public function stream_open($path, $mode, $options, &$opened_path)
{ {
// echo "DummyFileSystemStream->stream_open($path, $mode, $options)" . PHP_EOL; // echo "DummyFileSystemStream->stream_open($path, $mode, $options)" . PHP_EOL;
@@ -64,7 +64,7 @@ class DummyFileSystemStream
return true; return true;
} }
function stream_read($count) public function stream_read($count)
{ {
// echo "DummyFileSystemStream->stream_read($count)" . PHP_EOL; // echo "DummyFileSystemStream->stream_read($count)" . PHP_EOL;
$position = ftell($this->fp); $position = ftell($this->fp);
@@ -77,28 +77,28 @@ class DummyFileSystemStream
return $ret; return $ret;
} }
function stream_tell() public function stream_tell()
{ {
// echo "DummyFileSystemStream->stream_tell()" . PHP_EOL; // echo "DummyFileSystemStream->stream_tell()" . PHP_EOL;
return ftell($this->fp); return ftell($this->fp);
} }
function stream_eof() public function stream_eof()
{ {
// echo "DummyFileSystemStream->stream_eof()" . PHP_EOL; // echo "DummyFileSystemStream->stream_eof()" . PHP_EOL;
$isfeof = feof($this->fp); $isfeof = feof($this->fp);
return $isfeof; return $isfeof;
} }
function stream_seek($offset, $whence) public function stream_seek($offset, $whence)
{ {
// echo "DummyFileSystemStream->stream_seek($offset, $whence)" . PHP_EOL; // echo "DummyFileSystemStream->stream_seek($offset, $whence)" . PHP_EOL;
fseek($this->fp, $offset, $whence); fseek($this->fp, $offset, $whence);
} }
function stream_stat() public function stream_stat()
{ {
// echo "DummyFileSystemStream->stream_stat()" . PHP_EOL; // echo "DummyFileSystemStream->stream_stat()" . PHP_EOL;
return fstat($this->fp); return fstat($this->fp);
} }
} }