diff options
author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-09 22:49:21 -0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-10 19:20:23 +0100 |
commit | 21e3b0c70cb338a237cc11ccc27959eac9862ded (patch) | |
tree | 2c805882a8d0b48b40ea05ba3af1d9871f12fac8 /ext/spl | |
parent | 1422e2ffd19916a6c6a15577a36d1e21b5f630b8 (diff) | |
download | php-git-21e3b0c70cb338a237cc11ccc27959eac9862ded.tar.gz |
Remove trailing whitespace in inc files
Diffstat (limited to 'ext/spl')
31 files changed, 145 insertions, 145 deletions
diff --git a/ext/spl/examples/autoload.inc b/ext/spl/examples/autoload.inc index 5871e7d63b..2ccd0d1be8 100644 --- a/ext/spl/examples/autoload.inc +++ b/ext/spl/examples/autoload.inc @@ -23,7 +23,7 @@ function __load_class($classname, $dir) return false; } -/** +/** * @brief Class loader for SPL example classes * @author Marcus Boerger * @version 1.0 diff --git a/ext/spl/examples/dbaarray.inc b/ext/spl/examples/dbaarray.inc index d448ad7299..d6ee56f442 100644 --- a/ext/spl/examples/dbaarray.inc +++ b/ext/spl/examples/dbaarray.inc @@ -49,12 +49,12 @@ class DbaArray extends DbaReader implements ArrayAccess */ function offsetGet($name) { - $data = dba_fetch($name, $this->db); + $data = dba_fetch($name, $this->db); if($data) { //return unserialize($data); return $data; } - else + else { return NULL; } diff --git a/ext/spl/examples/dbareader.inc b/ext/spl/examples/dbareader.inc index b09791239b..01de37e990 100644 --- a/ext/spl/examples/dbareader.inc +++ b/ext/spl/examples/dbareader.inc @@ -32,7 +32,7 @@ class DbaReader implements Iterator throw new exception('Could not open file ' . $file); } } - + /** * Close database. */ @@ -60,7 +60,7 @@ class DbaReader implements Iterator /** * Fetches the current data if $key is valid - */ + */ private function fetch_data() { if ($this->key !== false) { $this->val = dba_fetch($this->key, $this->db); diff --git a/ext/spl/examples/directoryfilterdots.inc b/ext/spl/examples/directoryfilterdots.inc index 37f14b7106..454bd90883 100644 --- a/ext/spl/examples/directoryfilterdots.inc +++ b/ext/spl/examples/directoryfilterdots.inc @@ -28,7 +28,7 @@ class DirectoryFilterDots extends RecursiveFilterIterator } /** @return whether the current entry is neither '.' nor '..' - */ + */ function accept() { return !$this->getInnerIterator()->isDot(); diff --git a/ext/spl/examples/directorygraphiterator.inc b/ext/spl/examples/directorygraphiterator.inc index 5808e3b89e..3f0bb263e2 100644 --- a/ext/spl/examples/directorygraphiterator.inc +++ b/ext/spl/examples/directorygraphiterator.inc @@ -23,9 +23,9 @@ class DirectoryGraphIterator extends DirectoryTreeIterator new ParentIterator( new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME ) - ), + ), CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD - ), + ), parent::SELF_FIRST ); } diff --git a/ext/spl/examples/directorytreeiterator.inc b/ext/spl/examples/directorytreeiterator.inc index 8e65d0db12..8454d9e305 100644 --- a/ext/spl/examples/directorytreeiterator.inc +++ b/ext/spl/examples/directorytreeiterator.inc @@ -24,27 +24,27 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator parent::__construct( new RecursiveCachingIterator( new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::KEY_AS_FILENAME - ), + ), CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD - ), + ), parent::SELF_FIRST ); } /** @return the current element prefixed with ASCII graphics - */ + */ function current() { $tree = ''; for ($l=0; $l < $this->getDepth(); $l++) { $tree .= $this->getSubIterator($l)->hasNext() ? '| ' : ' '; } - return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : '\-') + return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : '\-') . $this->getSubIterator($l)->__toString(); } /** Aggregates the inner iterator - */ + */ function __call($func, $params) { return call_user_func_array(array($this->getSubIterator(), $func), $params); diff --git a/ext/spl/examples/dualiterator.inc b/ext/spl/examples/dualiterator.inc index 4cee203436..eeb8ae869c 100644 --- a/ext/spl/examples/dualiterator.inc +++ b/ext/spl/examples/dualiterator.inc @@ -24,9 +24,9 @@ class DualIterator implements Iterator const KEY_LHS = 0x10; const KEY_RHS = 0x20; const KEY_0 = 0x00; - + const DEFAULT_FLAGS = 0x13; - + private $lhs; private $rhs; private $flags; @@ -37,7 +37,7 @@ class DualIterator implements Iterator * @param rhs Right Hand Side Iterator * @param flags iteration flags */ - function __construct(Iterator $lhs, Iterator $rhs, + function __construct(Iterator $lhs, Iterator $rhs, $flags = 0x13 /*DualIterator::DEFAULT_FLAGS*/) { $this->lhs = $lhs; @@ -74,22 +74,22 @@ class DualIterator implements Iterator } /** rewind both inner iterators - */ + */ function rewind() { $this->lhs->rewind(); - $this->rhs->rewind(); + $this->rhs->rewind(); } /** @return whether both inner iterators are valid - */ + */ function valid() { - return $this->lhs->valid() && $this->rhs->valid(); + return $this->lhs->valid() && $this->rhs->valid(); } /** @return current value depending on CURRENT_* flags - */ + */ function current() { switch($this->flags & 0x0F) @@ -107,7 +107,7 @@ class DualIterator implements Iterator } /** @return key value depending on KEY_* flags - */ + */ function key() { switch($this->flags & 0xF0) @@ -123,14 +123,14 @@ class DualIterator implements Iterator } /** move both inner iterators forward - */ + */ function next() { $this->lhs->next(); $this->rhs->next(); } - /** @return whether both inner iterators are valid and have identical + /** @return whether both inner iterators are valid and have identical * current and key values or both are non valid. */ function areIdentical() @@ -141,7 +141,7 @@ class DualIterator implements Iterator : $this->lhs->valid() == $this->rhs->valid(); } - /** @return whether both inner iterators are valid and have equal current + /** @return whether both inner iterators are valid and have equal current * and key values or both are non valid. */ function areEqual() @@ -162,14 +162,14 @@ class DualIterator implements Iterator * @note If one implements RecursiveIterator the other must do as well. * And if both do then a recursive comparison is being used. */ - static function compareIterators(Iterator $lhs, Iterator $rhs, + static function compareIterators(Iterator $lhs, Iterator $rhs, $identical = false) { if ($lhs instanceof RecursiveIterator) { if ($rhs instanceof RecursiveIterator) { - $it = new RecursiveDualIterator($lhs, $rhs, + $it = new RecursiveDualIterator($lhs, $rhs, self::CURRENT_0 | self::KEY_0); $it = new RecursiveCompareDualIterator($it); } diff --git a/ext/spl/examples/inigroups.inc b/ext/spl/examples/inigroups.inc index 62cfa3e029..cb2bb04a57 100644 --- a/ext/spl/examples/inigroups.inc +++ b/ext/spl/examples/inigroups.inc @@ -18,11 +18,11 @@ if (!class_exists("DbaReader", false)) require_once("dbareader.inc"); * @version 1.1 * * Using this class you can iterator over all groups of a ini file. - * + * * This class uses a 'is-a' relation to KeyFilter in contrast to a 'has-a' - * relation. Doing so both current() and key() methods must be overwritten. + * relation. Doing so both current() and key() methods must be overwritten. * If it would use a 'has-a' relation there would be much more to type... - * but for puritists that would allow correctness in so far as then no + * but for puritists that would allow correctness in so far as then no * key() would be needed. */ class IniGroups extends KeyFilter diff --git a/ext/spl/examples/keyfilter.inc b/ext/spl/examples/keyfilter.inc index eaf6b77364..abc925ec43 100644 --- a/ext/spl/examples/keyfilter.inc +++ b/ext/spl/examples/keyfilter.inc @@ -16,7 +16,7 @@ * * Instances of this class act as a filter around iterators whose elements * are strings. In other words you can put an iterator into the constructor - * and the instance will only return elements which match the given regular + * and the instance will only return elements which match the given regular * expression. */ class KeyFilter extends FilterIterator @@ -38,13 +38,13 @@ class KeyFilter extends FilterIterator $this->regex = $regex; } - /** \return whether the current key mathes the regular expression + /** \return whether the current key mathes the regular expression */ function accept() { return ereg($this->regex, $this->getInnerIterator()->key()); } - + /** @return regular expression used as filter */ function getRegex() @@ -57,7 +57,7 @@ class KeyFilter extends FilterIterator */ protected function __clone() { - // disallow clone + // disallow clone } } diff --git a/ext/spl/examples/recursivecomparedualiterator.inc b/ext/spl/examples/recursivecomparedualiterator.inc index 75265c1d58..5b63e9f0b3 100644 --- a/ext/spl/examples/recursivecomparedualiterator.inc +++ b/ext/spl/examples/recursivecomparedualiterator.inc @@ -33,7 +33,7 @@ class RecursiveCompareDualIterator extends RecursiveIteratorIterator } /** Rewind iteration andcomparison process. Starting with $equal = true. - */ + */ function rewind() { $this->equal = true; @@ -49,7 +49,7 @@ class RecursiveCompareDualIterator extends RecursiveIteratorIterator && !$this->getInnerIterator()->getRHS()->valid(); } - /** @return whether both inner iterators are valid and have identical + /** @return whether both inner iterators are valid and have identical * current and key values or both are non valid. */ function areIdentical() @@ -57,7 +57,7 @@ class RecursiveCompareDualIterator extends RecursiveIteratorIterator return $this->equal && $this->getInnerIterator()->areIdentical(); } - /** @return whether both inner iterators are valid and have equal current + /** @return whether both inner iterators are valid and have equal current * and key values or both are non valid. */ function areEqual() diff --git a/ext/spl/examples/recursivedualiterator.inc b/ext/spl/examples/recursivedualiterator.inc index cfa3bccbbc..a56984e083 100644 --- a/ext/spl/examples/recursivedualiterator.inc +++ b/ext/spl/examples/recursivedualiterator.inc @@ -24,7 +24,7 @@ class RecursiveDualIterator extends DualIterator implements RecursiveIterator * @param rhs Right Hand Side Iterator * @param flags iteration flags */ - function __construct(RecursiveIterator $lhs, RecursiveIterator $rhs, + function __construct(RecursiveIterator $lhs, RecursiveIterator $rhs, $flags = 0x33 /*DualIterator::DEFAULT_FLAGS*/) { parent::__construct($lhs, $rhs, $flags); @@ -34,10 +34,10 @@ class RecursiveDualIterator extends DualIterator implements RecursiveIterator */ function hasChildren() { - return $this->getLHS()->hasChildren() && $this->getRHS()->hasChildren(); + return $this->getLHS()->hasChildren() && $this->getRHS()->hasChildren(); } - /** @return new RecursiveDualIterator (late binding) for the two inner + /** @return new RecursiveDualIterator (late binding) for the two inner * iterators current children. */ function getChildren() diff --git a/ext/spl/examples/searchiterator.inc b/ext/spl/examples/searchiterator.inc index 944a4ac5a5..ff4963bc72 100644 --- a/ext/spl/examples/searchiterator.inc +++ b/ext/spl/examples/searchiterator.inc @@ -38,7 +38,7 @@ abstract class SearchIterator extends FilterIterator { return !$this->done && parent::valid(); } - + /** Do not move forward but instead mark as finished. * @return void */ @@ -48,7 +48,7 @@ abstract class SearchIterator extends FilterIterator } /** Aggregates the inner iterator - */ + */ function __call($func, $params) { return call_user_func_array(array($this->getInnerIterator(), $func), $params); diff --git a/ext/spl/internal/appenditerator.inc b/ext/spl/internal/appenditerator.inc index 28e32b15f6..72eb258136 100644 --- a/ext/spl/internal/appenditerator.inc +++ b/ext/spl/internal/appenditerator.inc @@ -34,7 +34,7 @@ class AppendIterator implements OuterIterator * the AppendIterator itself becomes valid. However there will be no * call to $it->rewind(). Also if the current state is invalid the inner * ArrayIterator will be rewound und forwarded to the appended element. - */ + */ function append(Iterator $it) { $this->iterators->append($it); @@ -84,7 +84,7 @@ class AppendIterator implements OuterIterator return $this->iterators->valid() ? $this->getInnerIterator()->key() : NULL; } - /** Move to the next element. If this means to another Iterator that + /** Move to the next element. If this means to another Iterator that * rewind that Iterator. * @return void */ @@ -112,7 +112,7 @@ class AppendIterator implements OuterIterator } /** Aggregates the inner iterator - */ + */ function __call($func, $params) { return call_user_func_array(array($this->getInnerIterator(), $func), $params); diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc index 4d4bf8dbff..077ac726cf 100644 --- a/ext/spl/internal/cachingiterator.inc +++ b/ext/spl/internal/cachingiterator.inc @@ -18,8 +18,8 @@ * This iterator wrapper does a one ahead iteration. This way it knows whether * the inner iterator has one more element. * - * @note If you want to convert the elements into strings and the inner - * Iterator is an internal Iterator then you need to provide the + * @note If you want to convert the elements into strings and the inner + * Iterator is an internal Iterator then you need to provide the * flag CALL_TOSTRING to do the conversion when the actual element * is being fetched. Otherwise the conversion would happen with the * already changed iterator. If you do not need this then it you should @@ -41,7 +41,7 @@ class CachingIterator implements OuterIterator /** Construct from another iterator * * @param it Iterator to cache - * @param flags Bitmask: + * @param flags Bitmask: * - CALL_TOSTRING (whether to call __toString() for every element) */ function __construct(Iterator $it, $flags = self::CALL_TOSTRING) @@ -63,7 +63,7 @@ class CachingIterator implements OuterIterator $this->it->rewind(); $this->next(); } - + /** Forward to the next element */ function next() @@ -85,7 +85,7 @@ class CachingIterator implements OuterIterator } $this->it->next(); } - + /** @return whether the iterator is valid */ function valid() @@ -99,7 +99,7 @@ class CachingIterator implements OuterIterator { return $this->it->valid(); } - + /** @return the current element */ function current() @@ -123,8 +123,8 @@ class CachingIterator implements OuterIterator { return call_user_func_array(array($this->it, $func), $params); } - - /** @return the string represenatation that was generated for the current + + /** @return the string represenatation that was generated for the current * element * @throw exception when CALL_TOSTRING was not specified in constructor */ @@ -144,10 +144,10 @@ class CachingIterator implements OuterIterator } return $this->strValue; } - + /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; diff --git a/ext/spl/internal/filteriterator.inc b/ext/spl/internal/filteriterator.inc index 3330cc9e47..e11e467a10 100644 --- a/ext/spl/internal/filteriterator.inc +++ b/ext/spl/internal/filteriterator.inc @@ -15,12 +15,12 @@ * @version 1.1 * @since PHP 5.0 * - * Instances of this class act as a filter around iterators. In other words - * you can put an iterator into the constructor and the instance will only + * Instances of this class act as a filter around iterators. In other words + * you can put an iterator into the constructor and the instance will only * return selected (accepted) elements. * - * The only thing that needs to be done to make this work is implementing - * method accept(). Typically this invloves reading the current element or + * The only thing that needs to be done to make this work is implementing + * method accept(). Typically this invloves reading the current element or * key of the inner Iterator and checking whether it is acceptable. */ abstract class FilterIterator implements OuterIterator @@ -39,7 +39,7 @@ abstract class FilterIterator implements OuterIterator /** * Rewind the inner iterator. */ - function rewind() { + function rewind() { $this->it->rewind(); $this->fetch(); } @@ -76,38 +76,38 @@ abstract class FilterIterator implements OuterIterator $this->it->next(); $this->fetch(); } - + /** * @return Whether more elements are available */ function valid() { return $this->it->valid(); } - + /** * @return The current key */ function key() { return $this->it->key(); } - + /** * @return The current value */ function current() { return $this->it->current(); } - + /** * hidden __clone */ protected function __clone() { - // disallow clone + // disallow clone } /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc index 451d05da32..cdf89d8306 100644 --- a/ext/spl/internal/iteratoriterator.inc +++ b/ext/spl/internal/iteratoriterator.inc @@ -13,8 +13,8 @@ * @brief Basic Iterator wrapper * @since PHP 5.1 * - * This iterator wrapper allows to convert anything that is traversable into - * an Iterator. It is very important to understand that most classes that do + * This iterator wrapper allows to convert anything that is traversable into + * an Iterator. It is very important to understand that most classes that do * not implement Iterator have their reasone to. Most likely they do not allow * the full Iterator feature set. If so you need to provide techniques to * prevent missuse. If you do not you must expect exceptions or fatal errors. @@ -32,7 +32,7 @@ } \endcode * - * As you can see in the example this approach requires that the class to + * As you can see in the example this approach requires that the class to * downcast to is actually a base class of the specified iterator to wrap. * Omitting the downcast in the above example would result in an endless loop * since IteratorIterator::__construct() would call SomeClass::getIterator(). diff --git a/ext/spl/internal/limititerator.inc b/ext/spl/internal/limititerator.inc index c5bddead78..00c4122872 100644 --- a/ext/spl/internal/limititerator.inc +++ b/ext/spl/internal/limititerator.inc @@ -47,7 +47,7 @@ class LimitIterator implements OuterIterator $this->count = $count; $this->pos = 0; } - + /** Seek to specified position * @param position offset to seek to (relative to beginning not offset * specified in constructor). @@ -78,14 +78,14 @@ class LimitIterator implements OuterIterator $this->pos = 0; $this->seek($this->offset); } - + /** @return whether iterator is valid */ function valid() { return ($this->count == -1 || $this->pos < $this->offset + $this->count) && $this->it->valid(); } - + /** @return current key */ function key() { @@ -105,7 +105,7 @@ class LimitIterator implements OuterIterator $this->pos++; } - /** @return current position relative to zero (not to offset specified in + /** @return current position relative to zero (not to offset specified in * constructor). */ function getPosition() { @@ -114,7 +114,7 @@ class LimitIterator implements OuterIterator /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; diff --git a/ext/spl/internal/parentiterator.inc b/ext/spl/internal/parentiterator.inc index cc377fcc6b..69a223444d 100644 --- a/ext/spl/internal/parentiterator.inc +++ b/ext/spl/internal/parentiterator.inc @@ -15,8 +15,8 @@ * @version 1.2 * @since PHP 5.1 * - * This extended FilterIterator allows a recursive iteration using - * RecursiveIteratorIterator that only shows those elements which have + * This extended FilterIterator allows a recursive iteration using + * RecursiveIteratorIterator that only shows those elements which have * children. */ class ParentIterator extends RecursiveFilterIterator diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc index a9450e12a5..2059b97c1c 100644 --- a/ext/spl/internal/recursivearrayiterator.inc +++ b/ext/spl/internal/recursivearrayiterator.inc @@ -18,12 +18,12 @@ * Passes the RecursiveIterator interface to the inner Iterator and provides * the same functionality as FilterIterator. This allows you to skip parents * and all their childs before loading them all. You need to care about - * function getChildren() because it may not always suit your needs. The + * function getChildren() because it may not always suit your needs. The * builtin behavior uses reflection to return a new instance of the exact same * class it is called from. That is you extend RecursiveFilterIterator and * getChildren() will create instance of that class. The problem is that doing * this does not transport any state or control information of your accept() - * implementation to the new instance. To overcome this problem you might + * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the * control vaules manually. */ @@ -52,7 +52,7 @@ class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator } return $this->ref->newInstance($this->current()); } - + private $ref; } diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc index cd5d3e31f5..3ae127ad94 100644 --- a/ext/spl/internal/recursivecachingiterator.inc +++ b/ext/spl/internal/recursivecachingiterator.inc @@ -25,7 +25,7 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera /** Construct from another iterator * * @param it Iterator to cache - * @param flags Bitmask: + * @param flags Bitmask: * - CALL_TOSTRING (whether to call __toString() for every element) * - CATCH_GET_CHILD (whether to catch exceptions when trying to get childs) */ @@ -35,7 +35,7 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera } /** Rewind Iterator - */ + */ function rewind(); { $this->hasChildren = false; @@ -74,13 +74,13 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera } parent::next(); } - + private $ref; /** @return whether the current element has children * @note The check whether the Iterator for the children can be created was * already executed. Hence when flag CATCH_GET_CHILD was given in - * constructor this function returns false so that getChildren does + * constructor this function returns false so that getChildren does * not try to access those children. */ function hasChildren() diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc index b089919a30..87d98da885 100644 --- a/ext/spl/internal/recursivefilteriterator.inc +++ b/ext/spl/internal/recursivefilteriterator.inc @@ -18,12 +18,12 @@ * Passes the RecursiveIterator interface to the inner Iterator and provides * the same functionality as FilterIterator. This allows you to skip parents * and all their childs before loading them all. You need to care about - * function getChildren() because it may not always suit your needs. The + * function getChildren() because it may not always suit your needs. The * builtin behavior uses reflection to return a new instance of the exact same * class it is called from. That is you extend RecursiveFilterIterator and * getChildren() will create instance of that class. The problem is that doing * this does not transport any state or control information of your accept() - * implementation to the new instance. To overcome this problem you might + * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the * control vaules manually. */ @@ -35,7 +35,7 @@ abstract class RecursiveFilterIterator extends FilterIterator implements Recursi { parent::__construct($it); } - + /** @return whether the current element has children */ function hasChildren() @@ -55,7 +55,7 @@ abstract class RecursiveFilterIterator extends FilterIterator implements Recursi } return $this->ref->newInstance($this->getInnerIterator()->getChildren()); } - + private $ref; } diff --git a/ext/spl/internal/recursiveiterator.inc b/ext/spl/internal/recursiveiterator.inc index 1eab3d69b2..6e6c023486 100644 --- a/ext/spl/internal/recursiveiterator.inc +++ b/ext/spl/internal/recursiveiterator.inc @@ -20,7 +20,7 @@ interface RecursiveIterator extends Iterator /** @return whether the current element has children */ function hasChildren(); - + /** @return the sub iterator for the current element * @note The returned object must implement RecursiveIterator. */ diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc index 35fa801e78..c22a92bf71 100644 --- a/ext/spl/internal/recursiveiteratoriterator.inc +++ b/ext/spl/internal/recursiveiteratoriterator.inc @@ -15,8 +15,8 @@ * @version 1.2 * @since PHP 5.0 * - * The objects of this class are created by instances of RecursiveIterator. - * Elements of those iterators may be traversable themselves. If so these + * The objects of this class are created by instances of RecursiveIterator. + * Elements of those iterators may be traversable themselves. If so these * sub elements are recursed into. */ class RecursiveIteratorIterator implements OuterIterator @@ -47,7 +47,7 @@ class RecursiveIteratorIterator implements OuterIterator * @param flags Control flags, zero or any combination of the following * (since PHP 5.1). * - CATCH_GET_CHILD which catches exceptions during - * getChildren() calls and simply jumps to the next + * getChildren() calls and simply jumps to the next * element. */ function __construct(RecursiveIterator $it, $mode = self::LEAVES_ONLY, $flags = 0) @@ -69,7 +69,7 @@ class RecursiveIteratorIterator implements OuterIterator $this->ait[0]->recursed = false; callNextElement(true); } - + /** @return whether iterator is valid */ function valid() @@ -85,7 +85,7 @@ class RecursiveIteratorIterator implements OuterIterator } return false; } - + /** @return current key */ function key() @@ -93,7 +93,7 @@ class RecursiveIteratorIterator implements OuterIterator $it = $this->ait[$this->count]; return $it->key(); } - + /** @return current element */ function current() @@ -101,7 +101,7 @@ class RecursiveIteratorIterator implements OuterIterator $it = $this->ait[$this->count]; return $it->current(); } - + /** Forward to next element */ function next() @@ -153,7 +153,7 @@ class RecursiveIteratorIterator implements OuterIterator callNextElement(true); } - /** @return Sub Iterator at given level or if unspecified the current sub + /** @return Sub Iterator at given level or if unspecified the current sub * Iterator */ function getSubIterator($level = NULL) @@ -166,7 +166,7 @@ class RecursiveIteratorIterator implements OuterIterator /** * @return The inner iterator - */ + */ function getInnerIterator() { return $this->it; @@ -201,7 +201,7 @@ class RecursiveIteratorIterator implements OuterIterator function beginChildren() { } - + /** Called after current child iterator is invalid and right before it * gets destructed. * @since PHP 5.1 @@ -226,7 +226,7 @@ class RecursiveIteratorIterator implements OuterIterator } } } - + /** Called when the next element is available */ function nextElement() diff --git a/ext/spl/internal/recursiveregexiterator.inc b/ext/spl/internal/recursiveregexiterator.inc index ffcff0ce47..4223104398 100644 --- a/ext/spl/internal/recursiveregexiterator.inc +++ b/ext/spl/internal/recursiveregexiterator.inc @@ -15,20 +15,20 @@ * @version 1.0 * @since PHP 5.1 * - * This filter iterator assumes that the inner iterator + * This filter iterator assumes that the inner iterator */ class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator { /** - * Constructs a regular expression filter around an iterator whose + * Constructs a regular expression filter around an iterator whose * elemnts or keys are strings. * * @param it inner iterator * @param regex the regular expression to match - * @param mode operation mode (one of self::MATCH, self::GET_MATCH, + * @param mode operation mode (one of self::MATCH, self::GET_MATCH, * self::ALL_MATCHES, self::SPLIT) * @param flags special flags (self::USE_KEY) - * @param preg_flags global PREG_* flags, see preg_match(), + * @param preg_flags global PREG_* flags, see preg_match(), * preg_match_all(), preg_split() */ function __construct(RecursiveIterator $it, $regex, $mode = 0, $flags = 0, $preg_flags = 0) { @@ -54,7 +54,7 @@ class RecursiveRegexIterator extends RegexIterator implements RecursiveIterator } return $this->ref->newInstance($this->getInnerIterator()->getChildren()); } - + private $ref; } diff --git a/ext/spl/internal/regexiterator.inc b/ext/spl/internal/regexiterator.inc index c6addb93d2..706eff33a7 100644 --- a/ext/spl/internal/regexiterator.inc +++ b/ext/spl/internal/regexiterator.inc @@ -15,11 +15,11 @@ * @version 1.0 * @since PHP 5.1 * - * This filter iterator assumes that the inner iterator + * This filter iterator assumes that the inner iterator */ class RegexIterator extends FilterIterator { - const USE_KEY = 0x00000001; /**< If present in $flags the key is + const USE_KEY = 0x00000001; /**< If present in $flags the key is used rather then the current value. */ const MATCH = 0; /**< Mode: Executed a plain match only */ @@ -27,26 +27,26 @@ class RegexIterator extends FilterIterator const ALL_MATCHES = 2; /**< Mode: Return all matches (if any) */ const SPLIT = 3; /**< Mode: Return the split values (if any) */ const REPLACE = 4; /**< Mode: Replace the input key or current */ - + private $regex; /**< the regular expression to match against */ - private $mode; /**< operation mode (one of self::MATCH, + private $mode; /**< operation mode (one of self::MATCH, self::GET_MATCH, self::ALL_MATCHES, self::SPLIT) */ private $flags; /**< special flags (self::USE_KEY) */ - private $preg_flags;/**< PREG_* flags, see preg_match(), preg_match_all(), - preg_split() */ + private $preg_flags;/**< PREG_* flags, see preg_match(), preg_match_all(), + preg_split() */ private $key; /**< the value used for key() */ private $current; /**< the value used for current() */ /** - * Constructs a regular expression filter around an iterator whose + * Constructs a regular expression filter around an iterator whose * elemnts or keys are strings. * * @param it inner iterator * @param regex the regular expression to match - * @param mode operation mode (one of self::MATCH, self::GET_MATCH, + * @param mode operation mode (one of self::MATCH, self::GET_MATCH, * self::ALL_MATCHES, self::SPLIT) * @param flags special flags (self::USE_KEY) - * @param preg_flags global PREG_* flags, see preg_match(), + * @param preg_flags global PREG_* flags, see preg_match(), * preg_match_all(), preg_split() */ function __construct(Iterator $it, $regex, $mode = 0, $flags = 0, $preg_flags = 0) { diff --git a/ext/spl/internal/seekableiterator.inc b/ext/spl/internal/seekableiterator.inc index b4f66bde4d..7728636981 100644 --- a/ext/spl/internal/seekableiterator.inc +++ b/ext/spl/internal/seekableiterator.inc @@ -25,8 +25,8 @@ interface SeekableIterator extends Iterator * \param $index position to seek to * \return void * - * The method should throw an exception if it is not possible to seek to - * the given position. Typically this exception should be of type + * The method should throw an exception if it is not possible to seek to + * the given position. Typically this exception should be of type * OutOfBoundsException. \code function seek($index); diff --git a/ext/spl/internal/spldoublylinkedlist.inc b/ext/spl/internal/spldoublylinkedlist.inc index e87e4b11d5..f01b6306a7 100644 --- a/ext/spl/internal/spldoublylinkedlist.inc +++ b/ext/spl/internal/spldoublylinkedlist.inc @@ -15,8 +15,8 @@ * The SplDoublyLinkedList class provides the main functionalities of a * doubly linked list (DLL). * @note The following userland implementation of Iterator is a bit different - * from the internal one. Internally, iterators generated by nested - * foreachs are independent, while they share the same traverse pointer + * from the internal one. Internally, iterators generated by nested + * foreachs are independent, while they share the same traverse pointer * in userland. */ class SplDoublyLinkedList implements Iterator, ArrayAccess, Countable @@ -113,7 +113,7 @@ class SplDoublyLinkedList implements Iterator, ArrayAccess, Countable return ($this->count() == 0); } - /** Changes the iteration mode. There are two orthogonal sets of modes that + /** Changes the iteration mode. There are two orthogonal sets of modes that * can be set: * - The direction of the iteration (either one or the other) * - SplDoublyLnkedList::IT_MODE_LIFO (Stack style) diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc index df941c6307..4b0c757b81 100644 --- a/ext/spl/internal/splfileobject.inc +++ b/ext/spl/internal/splfileobject.inc @@ -28,15 +28,15 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt private $flags = 0; private $delimiter= ','; private $enclosure= '"'; - + /** * Constructs a new file object - * + * * @param $file_name The name of the stream to open * @param $open_mode The file open mode * @param $use_include_path Whether to search in include paths * @param $context A stream context - * @throw RuntimeException If file cannot be opened (e.g. insufficient + * @throw RuntimeException If file cannot be opened (e.g. insufficient * access rights). */ function __construct($file_name, $open_mode = 'r', $use_include_path = false, $context = NULL) @@ -48,7 +48,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt } $this->fname = $file_name; } - + /** * @return whether the end of the stream is reached */ @@ -65,13 +65,13 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt $this->freeLine(); $this->lnum++; $buf = fgets($this->fp, $this->max_len); - + return $buf; } /** * @param delimiter character used as field separator - * @param enclosure end of + * @param enclosure end of * @return array containing read data */ function fgetcsv($delimiter = NULL, $enclosure = NULL) @@ -88,7 +88,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt case 2: break; } - return fgetcsv($this->fp, $this->max_len, $delimiter, $enclosure); + return fgetcsv($this->fp, $this->max_len, $delimiter, $enclosure); } /** @@ -140,7 +140,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt /** * @param pos new file position * @param whence seek method (SEEK_SET, SEEK_CUR, SEEK_END) - * @return Upon success, returns 0; otherwise, returns -1. Note that + * @return Upon success, returns 0; otherwise, returns -1. Note that * seeking past EOF is not considered an error. */ function fseek($pos, $whence = SEEK_SET) @@ -179,7 +179,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt /** Scan the next line * @param $format string specifying format to parse - */ + */ function fscanf($format /* , ... */) { $this->freeLine(); @@ -276,11 +276,11 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt { return !$this->eof(); } - + /** * @note Fill current line buffer if not done yet. - * @return line buffer - */ + * @return line buffer + */ function current() { if (is_null($this->line)) @@ -291,20 +291,20 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt } /** - * @return line number + * @return line number * @note fgetc() will increase the line number when reaing a new line char. * This has the effect key() called on a read a new line will already * return the increased line number. * @note Line counting works as long as you only read the file and do not * use fseek(). - */ + */ function key() { return $this->lnum; } /** Invalidate current line buffer. - */ + */ function next() { $this->freeLine(); @@ -342,7 +342,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt * @note If you DO overload this function key() and current() will increment * $this->lnum automatically. If not then function reaLine() will do * that for you. - */ + */ function getCurrentLine() { $this->freeLine(); @@ -363,7 +363,7 @@ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIt /** * @param $line_pos Seek to this line - */ + */ function seek($line_pos) { $this->rewind(); diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc index ffc6c99488..f27da4e001 100644 --- a/ext/spl/internal/splobjectstorage.inc +++ b/ext/spl/internal/splobjectstorage.inc @@ -31,21 +31,21 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess { rewind($this->storage); } - + /** @return whether iterator is valid */ function valid() { return key($this->storage) !== false; } - + /** @return current key */ function key() { return $this->index; } - + /** @return current object */ function current() @@ -53,7 +53,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $element = current($this->storage); return $element ? $element[0] : NULL } - + /** @return get current object's associated information * @since 5.3.0 */ @@ -62,7 +62,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $element = current($this->storage); return $element ? $element[1] : NULL } - + /** @return set current object's associated information * @since 5.3.0 */ @@ -72,7 +72,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $this->storage[$this->index][1] = $inf; } } - + /** Forward to next element */ function next() diff --git a/ext/spl/internal/splqueue.inc b/ext/spl/internal/splqueue.inc index 368a2597f3..259e8ddd12 100644 --- a/ext/spl/internal/splqueue.inc +++ b/ext/spl/internal/splqueue.inc @@ -11,7 +11,7 @@ /** @ingroup SPL * @brief Implementation of a Queue through a DoublyLinkedList. As SplQueue - * extends SplDoublyLinkedList, unshift() and pop() are still available + * extends SplDoublyLinkedList, unshift() and pop() are still available * even though they don't make much sense for a queue. For convenience, * two aliases are available: * - enqueue() is an alias of push() @@ -26,7 +26,7 @@ class SplQueue extends SplDoublyLinkedList { protected $_it_mode = parent::IT_MODE_FIFO; - /** Changes the iteration mode. There are two orthogonal sets of modes that + /** Changes the iteration mode. There are two orthogonal sets of modes that * can be set: * * - The behavior of the iterator (either one or the other) diff --git a/ext/spl/internal/splstack.inc b/ext/spl/internal/splstack.inc index 70b1443846..05436b585d 100644 --- a/ext/spl/internal/splstack.inc +++ b/ext/spl/internal/splstack.inc @@ -10,7 +10,7 @@ */ /** @ingroup SPL - * @brief Implementation of a stack through a DoublyLinkedList. As SplStack + * @brief Implementation of a stack through a DoublyLinkedList. As SplStack * extends SplDoublyLinkedList, shift() and unshift() are still available even * though they don't make much sense for a stack. * @since PHP 5.3 @@ -22,7 +22,7 @@ class SplStack extends SplDoublyLinkedList { protected $_it_mode = parent::IT_MODE_LIFO; - /** Changes the iteration mode. There are two orthogonal sets of modes that + /** Changes the iteration mode. There are two orthogonal sets of modes that * can be set: * * - The behavior of the iterator (either one or the other) |