Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#5155 in master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Oct 2, 2013
121 parents e0070f5 + 0ce4e78 + d678fea + fbadf39 + d24dc4d + 7886448 + 445cc01 + 58a19ab + 194409f + 4a0a5ab + e2b5a72 + 90b47c5 + 89df4b8 + 07eac97 + dbff227 + a8bc04a + 9e53124 + aa8a772 + 1dacd62 + b1d673b + 4ca3a91 + 3823a47 + fcdb53c + 4695159 + 8c4a1a4 + 1ac8bc9 + 266a726 + a48d0b4 + 8bbe006 + f7a58c4 + ef00607 + 03f1a39 + fa9020e + 290a868 + 12376e4 + f183282 + 5609ded + b742a14 + 6ee62cd + 2d5f08c + 5f0a20d + da6d437 + 6020243 + 6cf319f + 7764705 + 8858064 + d35a73e + 4dca7a7 + e331113 + b288c81 + a7e1ad0 + c0434da + bc3b794 + 137fd45 + d2ea768 + 614b493 + f2158f1 + 6ad7c37 + 4f10632 + 1be14cc + 46a76e6 + bb3de95 + f1962e2 + 8c5e72d + 580978e + fcbde5a + 0bc3146 + e29de4d + 3fda4ad + 69ba799 + 3227b7b + 5f6a326 + 0f56ab5 + 5b30430 + a696f90 + 08b23c4 + 6438497 + 1d7c8db + 9d80a9e + 10c5fc3 + 875f572 + d32773b + ab30fab + 679b87a + 4d48267 + 9b1b333 + a1ead02 + 8013fb4 + 257d444 + 742fa1f + 399dc4f + c027f2a + bd63175 + 5faf735 + 6b5631d + e91ce9b + 3c20bc3 + 269ff93 + 3bb86fe + 2cc8054 + ab199de + 4a7857c + a36f375 + a8ec94c + f4ffca4 + 8355c2f + 4f1d801 + fdb75ff + 0a0d8b3 + 59ca0b9 + b28f8fa + 3b565ef + c026857 + e99f31a + 715843c + f85a410 + 2213be0 + 07035bd + 0e9d9ef + 9d3ec66 + 04400e3 commit e733e70
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions test/Adapter/MockupStream.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ public function stream_open($path, $mode, $options, &$opened_path)
$this->test = $url["host"];
$this->position = 0;

self::$tests[$url["host"]] = '';
static::$tests[$url["host"]] = '';
return true;
}

public function stream_read($count)
{
$ret = substr(self::$tests[$this->test], $this->position, $count);
$ret = substr(static::$tests[$this->test], $this->position, $count);
$this->position += strlen($ret);
return $ret;
}

public function stream_write($data)
{
$left = substr(self::$tests[$this->test], 0, $this->position);
$right = substr(self::$tests[$this->test], $this->position + strlen($data));
self::$tests[$this->test] = $left . $data . $right;
$left = substr(static::$tests[$this->test], 0, $this->position);
$right = substr(static::$tests[$this->test], $this->position + strlen($data));
static::$tests[$this->test] = $left . $data . $right;
$this->position += strlen($data);
return strlen($data);
}
Expand All @@ -57,14 +57,14 @@ public function stream_tell()

public function stream_eof()
{
return $this->position >= strlen(self::$tests[$this->test]);
return $this->position >= strlen(static::$tests[$this->test]);
}

public function stream_seek($offset, $whence)
{
switch ($whence) {
case SEEK_SET:
if ($offset < strlen(self::$tests[$this->test]) && $offset >= 0) {
if ($offset < strlen(static::$tests[$this->test]) && $offset >= 0) {
$this->position = $offset;
return true;
} else {
Expand All @@ -82,8 +82,8 @@ public function stream_seek($offset, $whence)
break;

case SEEK_END:
if (strlen(self::$tests[$this->test]) + $offset >= 0) {
$this->position = strlen(self::$tests[$this->test]) + $offset;
if (strlen(static::$tests[$this->test]) + $offset >= 0) {
$this->position = strlen(static::$tests[$this->test]) + $offset;
return true;
} else {
return false;
Expand All @@ -97,6 +97,6 @@ public function stream_seek($offset, $whence)

public function __destruct()
{
unset(self::$tests[$this->test]);
unset(static::$tests[$this->test]);
}
}

0 comments on commit e733e70

Please sign in to comment.