robin/streams
1
0
Fork 0
mirror of https://codeberg.org/icewind/streams.git synced 2026-06-04 00:54:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

some extra type checks

Browse source
This commit is contained in:
Robin Appelman 2019-03-11 17:16:21 +01:00
commit 782e09ec62
8 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CallbackWrapper.php
View file

@ -58,7 +58,7 @@ class CallbackWrapper extends Wrapper {
* @param callable|null $close (optional)
* @param callable|null $readDir (optional)
* @param callable|null $preClose (optional)
* @return resource
* @return resource|bool
*
*/
public static function wrap($source, $read = null, $write = null, $close = null, $readDir = null, $preClose = null) {

2
src/CountWrapper.php
View file

@ -55,7 +55,7 @@ class CountWrapper extends Wrapper {
*
* @param resource $source
* @param callable $callback
* @return resource
* @return resource|bool
*
* @throws \BadMethodCallException
*/

2
src/Directory.php
View file

@ -19,7 +19,7 @@ interface Directory {
public function dir_opendir($path, $options);
/**
* @return string
* @return string|bool
*/
public function dir_readdir();

2
src/DirectoryFilter.php
View file

@ -46,7 +46,7 @@ class DirectoryFilter extends DirectoryWrapper {
/**
* @param resource $source
* @param callable $filter
* @return resource
* @return resource|bool
*/
public static function wrap($source, callable $filter) {
return self::wrapSource($source, [

4
src/IteratorDirectory.php
View file

@ -61,7 +61,7 @@ class IteratorDirectory extends WrapperHandler implements Directory {
}
/**
* @return string
* @return string|bool
*/
public function dir_readdir() {
if ($this->iterator->valid()) {
@ -92,7 +92,7 @@ class IteratorDirectory extends WrapperHandler implements Directory {
* Creates a directory handle from the provided array or iterator
*
* @param \Iterator | array $source
* @return resource
* @return resource|bool
*
* @throws \BadMethodCallException
*/

6
src/SeekableWrapper.php
View file

@ -35,7 +35,11 @@ class SeekableWrapper extends Wrapper {
public function stream_open($path, $mode, $options, &$opened_path) {
$this->loadContext();
$this->cache = fopen('php://temp', 'w+');
$cache = fopen('php://temp', 'w+');
if ($cache === false) {
return false;
}
$this->cache = $cache;
return true;
}

15
src/UrlCallBack.php
View file

@ -47,7 +47,6 @@ class UrlCallback extends Wrapper implements Url {
* @return \Icewind\Streams\Path
*
* @throws \BadMethodCallException
* @throws \Exception
*/
public static function wrap($source, $fopen = null, $opendir = null, $mkdir = null, $rename = null, $rmdir = null,
$unlink = null, $stat = null) {
@ -78,21 +77,29 @@ class UrlCallback extends Wrapper implements Url {
public function stream_open($path, $mode, $options, &$opened_path) {
$context = $this->loadUrlContext($path);
$this->callCallBack($context, 'fopen');
$this->setSourceStream(fopen($context['source'], $mode));
$source = fopen($context['source'], $mode);
if ($source === false) {
return false;
}
$this->setSourceStream($source);
return true;
}
public function dir_opendir($path, $options) {
$context = $this->loadUrlContext($path);
$this->callCallBack($context, 'opendir');
$this->setSourceStream(opendir($context['source']));
$source = opendir($context['source']);
if ($source === false) {
return false;
}
$this->setSourceStream($source);
return true;
}
public function mkdir($path, $mode, $options) {
$context = $this->loadUrlContext($path);
$this->callCallBack($context, 'mkdir');
return mkdir($context['source'], $mode, $options & STREAM_MKDIR_RECURSIVE);
return mkdir($context['source'], $mode, ($options & STREAM_MKDIR_RECURSIVE) > 0);
}
public function rmdir($path, $options) {

4
src/WrapperHandler.php
View file

@ -42,8 +42,8 @@ class WrapperHandler {
/**
* @param resource|int $source
* @param resource|array $context
* @param null $protocol deprecated, protocol is now automatically generated
* @param null $class deprecated, class is now automatically generated
* @param string|null $protocol deprecated, protocol is now automatically generated
* @param string|null $class deprecated, class is now automatically generated
* @return bool|resource
*/
protected static function wrapSource($source, $context = [], $protocol = null, $class = null) {