diff options
Diffstat (limited to 'ext/spl')
| -rw-r--r-- | ext/spl/internal/multipleiterator.inc | 2 | ||||
| -rw-r--r-- | ext/spl/internal/recursivearrayiterator.inc | 4 | ||||
| -rw-r--r-- | ext/spl/internal/recursivecachingiterator.inc | 2 | ||||
| -rw-r--r-- | ext/spl/internal/recursivefilteriterator.inc | 4 | ||||
| -rw-r--r-- | ext/spl/internal/recursiveiteratoriterator.inc | 2 | ||||
| -rw-r--r-- | ext/spl/internal/splfileobject.inc | 2 | ||||
| -rw-r--r-- | ext/spl/internal/splobjectstorage.inc | 4 | ||||
| -rw-r--r-- | ext/spl/php_spl.c | 2 | ||||
| -rwxr-xr-x | ext/spl/spl.php | 6 | ||||
| -rw-r--r-- | ext/spl/spl_directory.c | 2 | ||||
| -rw-r--r-- | ext/spl/spl_observer.c | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc index 12df011ecc..c0e31a04ac 100644 --- a/ext/spl/internal/multipleiterator.inc +++ b/ext/spl/internal/multipleiterator.inc @@ -33,7 +33,7 @@ class MultipleIterator implements Iterator /** keys are created from sub iterators position */ const MIT_KEYS_NUMERIC = 0; - /** keys are created from sub iterators associated infromation */ + /** keys are created from sub iterators associated information */ const MIT_KEYS_ASSOC = 2; /** Construct a new empty MultipleIterator diff --git a/ext/spl/internal/recursivearrayiterator.inc b/ext/spl/internal/recursivearrayiterator.inc index 2059b97c1c..07dbce3def 100644 --- a/ext/spl/internal/recursivearrayiterator.inc +++ b/ext/spl/internal/recursivearrayiterator.inc @@ -17,7 +17,7 @@ * * 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 + * and all their children before loading them all. You need to care about * 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 @@ -25,7 +25,7 @@ * this does not transport any state or control information of your accept() * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the - * control vaules manually. + * control values manually. */ class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator { diff --git a/ext/spl/internal/recursivecachingiterator.inc b/ext/spl/internal/recursivecachingiterator.inc index 3ae127ad94..1473b75457 100644 --- a/ext/spl/internal/recursivecachingiterator.inc +++ b/ext/spl/internal/recursivecachingiterator.inc @@ -27,7 +27,7 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera * @param it Iterator to cache * @param flags Bitmask: * - CALL_TOSTRING (whether to call __toString() for every element) - * - CATCH_GET_CHILD (whether to catch exceptions when trying to get childs) + * - CATCH_GET_CHILD (whether to catch exceptions when trying to get children) */ function __construct(RecursiveIterator $it, $flags = self::CALL_TOSTRING) { diff --git a/ext/spl/internal/recursivefilteriterator.inc b/ext/spl/internal/recursivefilteriterator.inc index 87d98da885..9d176112ba 100644 --- a/ext/spl/internal/recursivefilteriterator.inc +++ b/ext/spl/internal/recursivefilteriterator.inc @@ -17,7 +17,7 @@ * * 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 + * and all their children before loading them all. You need to care about * 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 @@ -25,7 +25,7 @@ * this does not transport any state or control information of your accept() * implementation to the new instance. To overcome this problem you might * need to overwrite getChildren(), call this implementation and pass the - * control vaules manually. + * control values manually. */ abstract class RecursiveFilterIterator extends FilterIterator implements RecursiveIterator { diff --git a/ext/spl/internal/recursiveiteratoriterator.inc b/ext/spl/internal/recursiveiteratoriterator.inc index c22a92bf71..529c01b076 100644 --- a/ext/spl/internal/recursiveiteratoriterator.inc +++ b/ext/spl/internal/recursiveiteratoriterator.inc @@ -42,7 +42,7 @@ class RecursiveIteratorIterator implements OuterIterator * @param it RecursiveIterator to iterate * @param mode Operation mode (one of): * - LEAVES_ONLY only show leaves - * - SELF_FIRST show parents prior to their childs + * - SELF_FIRST show parents prior to their children * - CHILD_FIRST show all children prior to their parent * @param flags Control flags, zero or any combination of the following * (since PHP 5.1). diff --git a/ext/spl/internal/splfileobject.inc b/ext/spl/internal/splfileobject.inc index 4b0c757b81..fea3d0cf61 100644 --- a/ext/spl/internal/splfileobject.inc +++ b/ext/spl/internal/splfileobject.inc @@ -17,7 +17,7 @@ */ class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIterator { - /** Flag: wheter to suppress new lines */ + /** Flag: whether to suppress new lines */ const DROP_NEW_LINE = 0x00000001; private $fp; diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc index f27da4e001..6b9b25f661 100644 --- a/ext/spl/internal/splobjectstorage.inc +++ b/ext/spl/internal/splobjectstorage.inc @@ -146,7 +146,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess $this->attach($obj, $inf); } - /** @param $obj Exising object to look for + /** @param $obj Existing object to look for * @return associative information stored with object * @throw UnexpectedValueException if Object $obj is not contained in * storage @@ -167,7 +167,7 @@ class SplObjectStorage implements Iterator, Countable, ArrayAccess throw new UnexpectedValueException('Object not found'); } - /** @param $obj Exising object to look for + /** @param $obj Existing object to look for * @return associative information stored with object * @since 5.3.0 */ diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 0263a132b1..c80adaed94 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -387,7 +387,7 @@ static void autoload_func_info_dtor(zval *element) } /* {{{ proto void spl_autoload_call(string class_name) - Try all registerd autoload function to load the requested class */ + Try all registered autoload function to load the requested class */ PHP_FUNCTION(spl_autoload_call) { zval *class_name, retval; diff --git a/ext/spl/spl.php b/ext/spl/spl.php index 8a68613417..adbcef6e8a 100755 --- a/ext/spl/spl.php +++ b/ext/spl/spl.php @@ -177,7 +177,7 @@ function spl_autoload(string $class_name, string $file_extensions = NULL) {/**/}; /** @ingroup SPL - * @brief Manual invocation of all registerd autoload functions + * @brief Manual invocation of all registered autoload functions * @since PHP 5.1 * * @param class_name name of class to load @@ -371,7 +371,7 @@ class BadMethodCallException extends BadFunctionCallException * @brief Exception that denotes a value not in the valid domain was used. * @since PHP 5.1 * - * This kind of exception should be used to inform about domain erors in + * This kind of exception should be used to inform about domain errors in * mathematical sense. * * @see RangeException @@ -731,7 +731,7 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Countable * over Arrays and Objects. * * When you want to iterate over the same array multiple times you need to - * instanciate ArrayObject and let it create ArrayIterator instances that + * instantiate ArrayObject and let it create ArrayIterator instances that * refer to it either by using foreach or by calling its getIterator() * method manually. */ diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 776f2ae44d..e37bd87d87 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -724,7 +724,7 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto intern = Z_SPLFILESYSTEM_P(getThis()); if (intern->_path) { - /* object is alreay initialized */ + /* object is already initialized */ zend_restore_error_handling(&error_handling); php_error_docref(NULL, E_WARNING, "Directory object is already initialized"); return; diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index a6e27f47b6..0dd755e07f 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -318,7 +318,7 @@ static HashTable* spl_object_storage_debug_info(zval *obj, int *is_temp) /* {{{ } /* }}} */ -/* overriden for garbage collection */ +/* overridden for garbage collection */ static HashTable *spl_object_storage_get_gc(zval *obj, zval **table, int *n) /* {{{ */ { int i = 0; |