mirror of
https://codeberg.org/icewind/streams.git
synced 2026-06-03 08:34:09 +02:00
formatting
This commit is contained in:
parent
a0abe86651
commit
fdc0e3f113
21 changed files with 118 additions and 111 deletions
|
|
@ -23,7 +23,7 @@ class CallbackWrapperTest extends WrapperTest {
|
|||
}
|
||||
|
||||
public function testWrapInvalidSource() {
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
$this->wrapSource('foo');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
namespace Icewind\Streams\Tests;
|
||||
|
||||
|
||||
use Icewind\Streams\CountWrapper;
|
||||
|
||||
class CountWrapperTest extends WrapperTest {
|
||||
|
|
|
|||
|
|
@ -9,36 +9,39 @@ namespace Icewind\Streams\Tests;
|
|||
|
||||
class DirectoryFilter extends \PHPUnit_Framework_TestCase {
|
||||
public function testFilterAcceptAll() {
|
||||
$this->filter(array('a', 'b', 'c'),
|
||||
$this->filter(
|
||||
['a', 'b', 'c'],
|
||||
function () {
|
||||
return true;
|
||||
},
|
||||
array('a', 'b', 'c')
|
||||
['a', 'b', 'c']
|
||||
);
|
||||
}
|
||||
|
||||
public function testFilterRejectAll() {
|
||||
$this->filter(array('a', 'b', 'c'),
|
||||
$this->filter(
|
||||
['a', 'b', 'c'],
|
||||
function () {
|
||||
return false;
|
||||
},
|
||||
array()
|
||||
[]
|
||||
);
|
||||
}
|
||||
|
||||
public function testFilterRejectLong() {
|
||||
$this->filter(array('a', 'bb', 'c'),
|
||||
$this->filter(
|
||||
['a', 'bb', 'c'],
|
||||
function ($file) {
|
||||
return strlen($file) < 2;
|
||||
},
|
||||
array('a', 'c')
|
||||
['a', 'c']
|
||||
);
|
||||
}
|
||||
|
||||
private function filter(array $files, callable $filter, array $expected) {
|
||||
$source = \Icewind\Streams\IteratorDirectory::wrap($files);
|
||||
$filtered = \Icewind\Streams\DirectoryFilter::wrap($source, $filter);
|
||||
$result = array();
|
||||
$result = [];
|
||||
while (($file = readdir($filtered)) !== false) {
|
||||
$result[] = $file;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@ class DirectoryWrapper extends IteratorDirectory {
|
|||
}
|
||||
|
||||
public function testManipulateContent() {
|
||||
$source = \Icewind\Streams\IteratorDirectory::wrap(array('asd', 'bar'));
|
||||
$source = \Icewind\Streams\IteratorDirectory::wrap(['asd', 'bar']);
|
||||
$wrapped = DirectoryWrapperDummy::wrap($source);
|
||||
$result = array();
|
||||
$result = [];
|
||||
while (($file = readdir($wrapped)) !== false) {
|
||||
$result[] = $file;
|
||||
}
|
||||
$this->assertEquals(array('asd_', 'bar_'), $result);
|
||||
$this->assertEquals(['asd_', 'bar_'], $result);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,15 +22,15 @@
|
|||
namespace Icewind\Streams\Tests;
|
||||
|
||||
class DirectoryWrapperDummy extends \Icewind\Streams\DirectoryWrapper {
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
|
||||
public function dir_readdir() {
|
||||
$file = parent::dir_readdir();
|
||||
if ($file !== false) {
|
||||
$file .= '_';
|
||||
}
|
||||
return $file;
|
||||
}
|
||||
public function dir_readdir() {
|
||||
$file = parent::dir_readdir();
|
||||
if ($file !== false) {
|
||||
$file .= '_';
|
||||
}
|
||||
return $file;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
namespace Icewind\Streams\Tests;
|
||||
|
||||
class DirectoryWrapperNull extends \Icewind\Streams\DirectoryWrapper {
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,15 +22,15 @@
|
|||
namespace Icewind\Streams\Tests;
|
||||
|
||||
class FailWrapper extends \Icewind\Streams\NullWrapper {
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
|
||||
public function stream_read($count) {
|
||||
return false;
|
||||
}
|
||||
public function stream_read($count) {
|
||||
return false;
|
||||
}
|
||||
|
||||
public function stream_write($data) {
|
||||
return false;
|
||||
}
|
||||
public function stream_write($data) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,12 +72,12 @@ class HashWrapperTest extends TestCase {
|
|||
*/
|
||||
public function testReadHash($algorithm, $expectedHash) {
|
||||
$obtainedHash = null;
|
||||
$callback = function($hash) use (&$obtainedHash) {
|
||||
$callback = function ($hash) use (&$obtainedHash) {
|
||||
$obtainedHash = $hash;
|
||||
};
|
||||
|
||||
$stream = $this->wrapSourceRead($this->getSource(), $algorithm, $callback);
|
||||
while(feof($stream) === false) {
|
||||
while (feof($stream) === false) {
|
||||
fread($stream, 20);
|
||||
}
|
||||
fclose($stream);
|
||||
|
|
@ -93,7 +93,7 @@ class HashWrapperTest extends TestCase {
|
|||
*/
|
||||
public function testWriteHash($algorithm, $expectedHash) {
|
||||
$obtainedHash = null;
|
||||
$callback = function($hash) use (&$obtainedHash) {
|
||||
$callback = function ($hash) use (&$obtainedHash) {
|
||||
$obtainedHash = $hash;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class IteratorDirectory extends \PHPUnit_Framework_TestCase {
|
|||
* @expectedException \BadMethodCallException
|
||||
*/
|
||||
public function testNoContext() {
|
||||
$context = stream_context_create(array());
|
||||
$context = stream_context_create([]);
|
||||
stream_wrapper_register('iterator', '\Icewind\Streams\IteratorDirectory');
|
||||
try {
|
||||
opendir('iterator://', $context);
|
||||
|
|
@ -36,11 +36,11 @@ class IteratorDirectory extends \PHPUnit_Framework_TestCase {
|
|||
* @expectedException \BadMethodCallException
|
||||
*/
|
||||
public function testNoSource() {
|
||||
$context = stream_context_create(array(
|
||||
'dir' => array(
|
||||
$context = stream_context_create([
|
||||
'dir' => [
|
||||
'foo' => 'bar'
|
||||
)
|
||||
));
|
||||
]
|
||||
]);
|
||||
stream_wrapper_register('iterator', '\Icewind\Streams\IteratorDirectory');
|
||||
try {
|
||||
opendir('iterator://', $context);
|
||||
|
|
@ -60,16 +60,16 @@ class IteratorDirectory extends \PHPUnit_Framework_TestCase {
|
|||
|
||||
public function fileListProvider() {
|
||||
$longList = array_fill(0, 500, 'foo');
|
||||
return array(
|
||||
array(
|
||||
array(
|
||||
return [
|
||||
[
|
||||
[
|
||||
'foo',
|
||||
'bar',
|
||||
'qwerty'
|
||||
)
|
||||
),
|
||||
array(
|
||||
array(
|
||||
]
|
||||
],
|
||||
[
|
||||
[
|
||||
'with spaces',
|
||||
'under_scores',
|
||||
'日本語',
|
||||
|
|
@ -78,24 +78,24 @@ class IteratorDirectory extends \PHPUnit_Framework_TestCase {
|
|||
'0',
|
||||
'double "quotes"',
|
||||
"single 'quotes'"
|
||||
)
|
||||
),
|
||||
array(
|
||||
array(
|
||||
]
|
||||
],
|
||||
[
|
||||
[
|
||||
'single item'
|
||||
)
|
||||
),
|
||||
array(
|
||||
]
|
||||
],
|
||||
[
|
||||
$longList
|
||||
),
|
||||
array(
|
||||
array()
|
||||
)
|
||||
);
|
||||
],
|
||||
[
|
||||
[]
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
protected function basicTest($fileList, $dh) {
|
||||
$result = array();
|
||||
$result = [];
|
||||
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
$result[] = $file;
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@ class NullWrapperTest extends WrapperTest {
|
|||
}
|
||||
|
||||
public function testNoContext() {
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
stream_wrapper_register('null', '\Icewind\Streams\NullWrapper');
|
||||
$context = stream_context_create(array());
|
||||
$context = stream_context_create([]);
|
||||
try {
|
||||
fopen('null://', 'r+', false, $context);
|
||||
stream_wrapper_unregister('null');
|
||||
|
|
@ -31,13 +31,13 @@ class NullWrapperTest extends WrapperTest {
|
|||
}
|
||||
|
||||
public function testNoSource() {
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
stream_wrapper_register('null', '\Icewind\Streams\NullWrapper');
|
||||
$context = stream_context_create(array(
|
||||
'null' => array(
|
||||
$context = stream_context_create([
|
||||
'null' => [
|
||||
'source' => 'bar'
|
||||
)
|
||||
));
|
||||
]
|
||||
]);
|
||||
try {
|
||||
fopen('null://', 'r+', false, $context);
|
||||
} catch (\Exception $e) {
|
||||
|
|
@ -47,7 +47,7 @@ class NullWrapperTest extends WrapperTest {
|
|||
}
|
||||
|
||||
public function testWrapInvalidSource() {
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
$this->expectException(\BadMethodCallException::class);
|
||||
$this->wrapSource('foo');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,17 +22,17 @@
|
|||
namespace Icewind\Streams\Tests;
|
||||
|
||||
class PartialWrapper extends \Icewind\Streams\NullWrapper {
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
public static function wrap($source) {
|
||||
return self::wrapSource($source);
|
||||
}
|
||||
|
||||
public function stream_read($count) {
|
||||
$count = min($count, 2); // return as most 2 bytes
|
||||
return parent::stream_read($count);
|
||||
}
|
||||
public function stream_read($count) {
|
||||
$count = min($count, 2); // return as most 2 bytes
|
||||
return parent::stream_read($count);
|
||||
}
|
||||
|
||||
public function stream_write($data) {
|
||||
$data = substr($data, 0, 2); //write as most 2 bytes
|
||||
return parent::stream_write($data);
|
||||
}
|
||||
public function stream_write($data) {
|
||||
$data = substr($data, 0, 2); //write as most 2 bytes
|
||||
return parent::stream_write($data);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
namespace Icewind\Streams\Tests;
|
||||
|
||||
class UrlCallback extends \PHPUnit_Framework_TestCase {
|
||||
protected $tempDirs = array();
|
||||
protected $tempDirs = [];
|
||||
|
||||
protected function getTempDir() {
|
||||
$dir = sys_get_temp_dir() . '/streams_' . uniqid();
|
||||
|
|
@ -30,7 +30,7 @@ class UrlCallback extends \PHPUnit_Framework_TestCase {
|
|||
* @var \SplFileInfo $file
|
||||
*/
|
||||
foreach ($iterator as $file) {
|
||||
if (in_array($file->getBasename(), array('.', '..'))) {
|
||||
if (in_array($file->getBasename(), ['.', '..'])) {
|
||||
continue;
|
||||
} elseif ($file->isDir()) {
|
||||
rmdir($file->getPathname());
|
||||
|
|
|
|||
|
|
@ -104,12 +104,12 @@ abstract class WrapperTest extends TestCase {
|
|||
stream_set_blocking($wrapped, 0);
|
||||
stream_set_timeout($wrapped, 1, 0);
|
||||
stream_set_write_buffer($wrapped, 0);
|
||||
$this->assertTrue(true);
|
||||
$this->assertTrue(true);
|
||||
}
|
||||
|
||||
public function testReadDir() {
|
||||
$source = opendir(__DIR__);
|
||||
$content = array();
|
||||
$content = [];
|
||||
while (($name = readdir($source)) !== false) {
|
||||
$content[] = $name;
|
||||
}
|
||||
|
|
@ -117,7 +117,7 @@ abstract class WrapperTest extends TestCase {
|
|||
|
||||
$source = opendir(__DIR__);
|
||||
$wrapped = $this->wrapSource($source);
|
||||
$wrappedContent = array();
|
||||
$wrappedContent = [];
|
||||
while (($name = readdir($wrapped)) !== false) {
|
||||
$wrappedContent[] = $name;
|
||||
}
|
||||
|
|
@ -126,7 +126,7 @@ abstract class WrapperTest extends TestCase {
|
|||
|
||||
public function testRewindDir() {
|
||||
$source = opendir(__DIR__);
|
||||
$content = array();
|
||||
$content = [];
|
||||
while (($name = readdir($source)) !== false) {
|
||||
$content[] = $name;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue