Browse Source

Use better name for the constant

PEAR_1_4DEV
Marcus Boerger 23 years ago
parent
commit
1c13018702
  1. 10
      ext/spl/examples/cachingiterator.inc
  2. 2
      ext/spl/examples/cachingrecursiveiterator.inc
  3. 2
      ext/spl/examples/directorygraphiterator.inc
  4. 2
      ext/spl/examples/directorytreeiterator.inc

10
ext/spl/examples/cachingiterator.inc

@ -1,6 +1,6 @@
<?php
define('CIT_GET_STR_VALUE', 1);
define('CIT_CALL_TOSTRING', 1);
define('CIT_CATCH_GET_CHILD', 2);
class CachingIterator
@ -12,10 +12,10 @@ class CachingIterator
protected $strValue;
protected $getStrVal;
function __construct(Iterator $it, $flags = CIT_GET_STR_VALUE)
function __construct(Iterator $it, $flags = CIT_CALL_TOSTRING)
{
$this->it = $it;
$this->flags = $flags & (CIT_GET_STR_VALUE|CIT_CATCH_GET_CHILD);
$this->flags = $flags & (CIT_CALL_TOSTRING|CIT_CATCH_GET_CHILD);
}
function rewind()
@ -29,7 +29,7 @@ class CachingIterator
if ($this->more = $this->it->hasMore()) {
$this->current = $this->it->current();
$this->key = $this->it->key();
if ($this->flags & CIT_GET_STR_VALUE) {
if ($this->flags & CIT_CALL_TOSTRING) {
if (is_object($this->current)) {
$this->strValue = $this->current->__toString();
} else {
@ -71,7 +71,7 @@ class CachingIterator
function __toString()
{
if (!$this->flags & CIT_GET_STR_VALUE) {
if (!$this->flags & CIT_CALL_TOSTRING) {
throw new exception('CachingIterator does not fetch string value (see CachingIterator::__construct)');
}
return $this->strValue;

2
ext/spl/examples/cachingrecursiveiterator.inc

@ -6,7 +6,7 @@ class CachingRecursiveIterator extends CachingIterator implements RecursiveItera
protected $getChildren;
protected $catch_get_child;
function __construct(RecursiveIterator $it, $flags = CIT_GET_STR_VALUE)
function __construct(RecursiveIterator $it, $flags = CIT_CALL_TOSTRING)
{
parent::__construct($it, $flags);
}

2
ext/spl/examples/directorygraphiterator.inc

@ -4,7 +4,7 @@ class DirectoryGraphIterator extends DirectoryTreeIterator
{
function __construct($path)
{
RecursiveIteratorIterator::__construct(new CachingRecursiveIterator(new ParentIterator(new RecursiveDirectoryIterator($path)), CIT_GET_STR_VALUE|CIT_CATCH_GET_CHILD), 1);
RecursiveIteratorIterator::__construct(new CachingRecursiveIterator(new ParentIterator(new RecursiveDirectoryIterator($path)), CIT_CALL_TOSTRING|CIT_CATCH_GET_CHILD), 1);
}
}

2
ext/spl/examples/directorytreeiterator.inc

@ -4,7 +4,7 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator
{
function __construct($path)
{
parent::__construct(new CachingRecursiveIterator(new RecursiveDirectoryIterator($path), CIT_GET_STR_VALUE|CIT_CATCH_GET_CHILD), 1);
parent::__construct(new CachingRecursiveIterator(new RecursiveDirectoryIterator($path), CIT_CALL_TOSTRING|CIT_CATCH_GET_CHILD), 1);
}
function current()

Loading…
Cancel
Save