diff --git a/language/functions.xml b/language/functions.xml index 4f0f0ab045..67e000c335 100644 --- a/language/functions.xml +++ b/language/functions.xml @@ -502,7 +502,7 @@ echo add(...$a); It is also possible to add a type declaration before the ... token. If this is present, then all arguments - captured by ... must be objects of the hinted class. + captured by ... must match that parameter type. Type declared variable arguments diff --git a/language/namespaces.xml b/language/namespaces.xml index c61c252af3..e12135bd7d 100644 --- a/language/namespaces.xml +++ b/language/namespaces.xml @@ -1186,7 +1186,7 @@ $a = new stdClass; namespace foo; $a = new \stdClass; -function test(\ArrayObject $typehintexample = null) {} +function test(\ArrayObject $parameter_type_example = null) {} $a = \DirectoryIterator::CURRENT_AS_FILEINFO; @@ -1213,10 +1213,10 @@ namespace foo; class MyClass {} -// using a class from the current namespace as a type hint -function test(MyClass $typehintexample = null) {} -// another way to use a class from the current namespace as a type hint -function test(\foo\MyClass $typehintexample = null) {} +// using a class from the current namespace as a parameter type +function test(MyClass $parameter_type_example = null) {} +// another way to use a class from the current namespace as a parameter type +function test(\foo\MyClass $parameter_type_example = null) {} // extending a class from the current namespace class Extended extends MyClass {} diff --git a/reference/datetime/datetimeinterface.xml b/reference/datetime/datetimeinterface.xml index 8c60b4b60f..935be5515f 100644 --- a/reference/datetime/datetimeinterface.xml +++ b/reference/datetime/datetimeinterface.xml @@ -12,9 +12,11 @@
&reftitle.intro; - DateTimeInterface is meant so that both DateTime and DateTimeImmutable can - be type hinted for. It is not possible to implement this interface with - userland classes. + DateTimeInterface was created + so that parameter, return, or property type declarations may accept either + DateTime or DateTimeImmutable + as a value. It is not possible to + implement this interface with userland classes.
diff --git a/reference/errorfunc/functions/set-exception-handler.xml b/reference/errorfunc/functions/set-exception-handler.xml index 4c1c19b2bf..50a0628978 100644 --- a/reference/errorfunc/functions/set-exception-handler.xml +++ b/reference/errorfunc/functions/set-exception-handler.xml @@ -55,13 +55,6 @@ &null; may be passed instead, to reset this handler to its default state. - - - Note that providing an explicit Exception type - hint for the ex parameter in your callback will - cause issues with the changed exception hierarchy in PHP 7. - - diff --git a/reference/mongodb/bson/binaryinterface.xml b/reference/mongodb/bson/binaryinterface.xml index add912a690..c768f0aa0f 100644 --- a/reference/mongodb/bson/binaryinterface.xml +++ b/reference/mongodb/bson/binaryinterface.xml @@ -11,7 +11,7 @@ &reftitle.intro; This interface is implemented by MongoDB\BSON\Binary - but may also be used for type-hinting and userland classes. + to be used as a parameter, return, or property type in userland classes. diff --git a/reference/mongodb/bson/decimal128interface.xml b/reference/mongodb/bson/decimal128interface.xml index 44c7af9fef..676a6d6a91 100644 --- a/reference/mongodb/bson/decimal128interface.xml +++ b/reference/mongodb/bson/decimal128interface.xml @@ -11,8 +11,8 @@ &reftitle.intro; This interface is implemented by - MongoDB\BSON\Decimal128 but may also be used for - type-hinting and userland classes. + MongoDB\BSON\Decimal128 to be used as a parameter, + return, or property type in userland classes. diff --git a/reference/mongodb/bson/javascriptinterface.xml b/reference/mongodb/bson/javascriptinterface.xml index 68caeca22c..49f1638272 100644 --- a/reference/mongodb/bson/javascriptinterface.xml +++ b/reference/mongodb/bson/javascriptinterface.xml @@ -11,8 +11,8 @@ &reftitle.intro; This interface is implemented by - MongoDB\BSON\Javascript but may also be used for - type-hinting and userland classes. + MongoDB\BSON\Javascript to be used as a parameter, + return, or property type in userland classes. diff --git a/reference/mongodb/bson/maxkeyinterface.xml b/reference/mongodb/bson/maxkeyinterface.xml index a00140d09b..52c63ea905 100644 --- a/reference/mongodb/bson/maxkeyinterface.xml +++ b/reference/mongodb/bson/maxkeyinterface.xml @@ -11,7 +11,7 @@ &reftitle.intro; This interface is implemented by MongoDB\BSON\MaxKey - but may also be used for type-hinting and userland classes. + to be used as a parameter, return, or property type in userland classes. diff --git a/reference/mongodb/bson/minkeyinterface.xml b/reference/mongodb/bson/minkeyinterface.xml index 5fad45014b..81e3c7241e 100644 --- a/reference/mongodb/bson/minkeyinterface.xml +++ b/reference/mongodb/bson/minkeyinterface.xml @@ -11,7 +11,7 @@ &reftitle.intro; This interface is implemented by MongoDB\BSON\MinKey - but may also be used for type-hinting and userland classes. + to be used as a parameter, return, or property type in userland classes. diff --git a/reference/mongodb/bson/objectidinterface.xml b/reference/mongodb/bson/objectidinterface.xml index eda9b11d73..760b4c1202 100644 --- a/reference/mongodb/bson/objectidinterface.xml +++ b/reference/mongodb/bson/objectidinterface.xml @@ -11,8 +11,8 @@ &reftitle.intro; This interface is implemented by - MongoDB\BSON\ObjectId but may also be used for - type-hinting and userland classes. + MongoDB\BSON\ObjectId to be used as a parameter, + return, or property type in userland classes. diff --git a/reference/mongodb/bson/regexinterface.xml b/reference/mongodb/bson/regexinterface.xml index 2a79ba60cd..789fe7bdc1 100644 --- a/reference/mongodb/bson/regexinterface.xml +++ b/reference/mongodb/bson/regexinterface.xml @@ -11,7 +11,7 @@ &reftitle.intro; This interface is implemented by MongoDB\BSON\Regex - but may also be used for type-hinting and userland classes. + to be used as a parameter, return, or property type in userland classes. diff --git a/reference/mongodb/bson/timestampinterface.xml b/reference/mongodb/bson/timestampinterface.xml index 41a600b439..38cb0e1dad 100644 --- a/reference/mongodb/bson/timestampinterface.xml +++ b/reference/mongodb/bson/timestampinterface.xml @@ -11,8 +11,8 @@ &reftitle.intro; This interface is implemented by - MongoDB\BSON\Timestamp but may also be used for - type-hinting and userland classes. + MongoDB\BSON\Timestamp to be used as a + parameter, return, or property type in userland classes. diff --git a/reference/mongodb/bson/utcdatetimeinterface.xml b/reference/mongodb/bson/utcdatetimeinterface.xml index 3dfc237c14..0d4122ef98 100644 --- a/reference/mongodb/bson/utcdatetimeinterface.xml +++ b/reference/mongodb/bson/utcdatetimeinterface.xml @@ -11,8 +11,8 @@ &reftitle.intro; This interface is implemented by - MongoDB\BSON\UTCDateTime but may also be used for - type-hinting and userland classes. + MongoDB\BSON\UTCDateTime to be used as a + parameter, return, or property type in userland classes. diff --git a/reference/mongodb/mongodb/driver/cursorinterface.xml b/reference/mongodb/mongodb/driver/cursorinterface.xml index 19dfedc1c0..4284d3dd1d 100644 --- a/reference/mongodb/mongodb/driver/cursorinterface.xml +++ b/reference/mongodb/mongodb/driver/cursorinterface.xml @@ -13,8 +13,8 @@ &reftitle.intro; This interface is implemented by - MongoDB\Driver\Cursor but may also be used for - type-hinting and userland classes. + MongoDB\Driver\Cursor to be used as + a parameter, return, or property type in userland classes. diff --git a/reference/mongodb/mongodb/driver/monitoring/subscriber.xml b/reference/mongodb/mongodb/driver/monitoring/subscriber.xml index acc3153f5d..0d46cd29a2 100644 --- a/reference/mongodb/mongodb/driver/monitoring/subscriber.xml +++ b/reference/mongodb/mongodb/driver/monitoring/subscriber.xml @@ -12,7 +12,7 @@
&reftitle.intro; - Base interface for event subscribers. This is used for type-hinting + Base interface for event subscribers. This is used as a parameter type in the functions MongoDB\Driver\Monitoring\addSubscriber and MongoDB\Driver\Monitoring\removeSubscriber and should not be implemented directly. diff --git a/reference/pdo/pdo/quote.xml b/reference/pdo/pdo/quote.xml index fa0627d61a..3b3ba6562a 100644 --- a/reference/pdo/pdo/quote.xml +++ b/reference/pdo/pdo/quote.xml @@ -60,7 +60,9 @@ type - Provides a data type hint for drivers that have alternate quoting styles. + Provides a hint to the type of data for drivers that have alternate quoting + styles. For example PDO_PARAM_LOB will tell the driver to + escape binary data. diff --git a/reference/reflection/reflectionnamedtype/getname.xml b/reference/reflection/reflectionnamedtype/getname.xml index 8d2bcbf4f9..4b4756b0f8 100644 --- a/reference/reflection/reflectionnamedtype/getname.xml +++ b/reference/reflection/reflectionnamedtype/getname.xml @@ -4,7 +4,7 @@ ReflectionNamedType::getName - Get the text of the type hint + Get the name of the type as a string @@ -23,7 +23,7 @@ &reftitle.returnvalues; - Returns the text of the type hint. + Returns the name of the type being reflected. diff --git a/reference/reflection/reflectionparameter/getclass.xml b/reference/reflection/reflectionparameter/getclass.xml index d4df4b1a25..a809b558c6 100644 --- a/reference/reflection/reflectionparameter/getclass.xml +++ b/reference/reflection/reflectionparameter/getclass.xml @@ -3,7 +3,7 @@ ReflectionParameter::getClass - Get the type hinted class + Get a ReflectionClass object for the parameter being reflected or &null; @@ -17,7 +17,7 @@ - Gets the class type hinted for the parameter as a ReflectionClass object. + Gets a ReflectionClass object for the parameter being reflected or &null;. As of PHP 8.0.0 this function is deprecated and not recommended. Instead, use diff --git a/reference/snmp/functions/snmp-set-valueretrieval.xml b/reference/snmp/functions/snmp-set-valueretrieval.xml index 9cc05bd785..c27eb5945e 100644 --- a/reference/snmp/functions/snmp-set-valueretrieval.xml +++ b/reference/snmp/functions/snmp-set-valueretrieval.xml @@ -35,7 +35,7 @@ SNMP_VALUE_PLAIN - The return values will be the plain value without the SNMP type hint. + The return values will be the plain value without the SNMP type information. SNMP_VALUE_OBJECT diff --git a/reference/snmp/snmp.xml b/reference/snmp/snmp.xml index 2c5d9d77b7..e92425e613 100644 --- a/reference/snmp/snmp.xml +++ b/reference/snmp/snmp.xml @@ -189,7 +189,7 @@ SNMP_VALUE_LIBRARYThe return values will be as returned by the Net-SNMP library. - SNMP_VALUE_PLAINThe return values will be the plain value without the SNMP type hint. + SNMP_VALUE_PLAINThe return values will be the plain value without the SNMP type information. SNMP_VALUE_OBJECT The return values will be objects with the properties "value" and "type", where the latter diff --git a/reference/soap/soapclient/getfunctions.xml b/reference/soap/soapclient/getfunctions.xml index 6d0da5624c..c3204afadc 100644 --- a/reference/soap/soapclient/getfunctions.xml +++ b/reference/soap/soapclient/getfunctions.xml @@ -27,7 +27,7 @@ &reftitle.returnvalues; The array of SOAP function prototypes, detailing the return type, - the function name and type-hinted parameters. + the function name and parameter types.