diff --git a/appendices/ini.core.xml b/appendices/ini.core.xml index 18741140f598..e009120091ef 100644 --- a/appendices/ini.core.xml +++ b/appendices/ini.core.xml @@ -426,7 +426,7 @@ Enable compatibility mode with Zend Engine 1 (PHP 4). It affects the cloning, casting (objects with no properties cast to &false; or 0), and comparing of objects. + linkend="language.oop.object-comparison">comparing of objects. In this mode, objects are passed by value instead of reference by default. diff --git a/appendices/migration5.xml b/appendices/migration5.xml index b2727006e94d..3432a94d5e04 100644 --- a/appendices/migration5.xml +++ b/appendices/migration5.xml @@ -108,7 +108,7 @@ In some cases classes must be declared before use. It only happens if some of the new features of PHP 5 (such as interfaces) are used. + linkend="language.oop.interfaces">interfaces) are used. Otherwise the behaviour is the old. @@ -916,7 +916,7 @@ Action application/x-httpd-php "/php/php-cgi.exe" The new Object Model is documented at the Language Reference. + linkend="language.oop">Language Reference. In PHP 5, function with the name of a class is called as a constructor diff --git a/appendices/migration52.xml b/appendices/migration52.xml index bf67a5f565df..559ee28c1e1b 100644 --- a/appendices/migration52.xml +++ b/appendices/migration52.xml @@ -281,7 +281,7 @@ include "php://input"; - <link linkend="language.oop5">Object Oriented Code</link> in PHP Core + <link linkend="language.oop">Object Oriented Code</link> in PHP Core - Support for Late Static + Support for Late Static Bindings has been added. @@ -736,7 +736,7 @@ try { Assigning the return value of - new by reference is now + new by reference is now deprecated. diff --git a/appendices/migration54.xml b/appendices/migration54.xml index 32c64b9d7e4f..0c2e6553b049 100644 --- a/appendices/migration54.xml +++ b/appendices/migration54.xml @@ -213,7 +213,7 @@ - trait + trait @@ -223,7 +223,7 @@ - insteadof + insteadof @@ -267,7 +267,7 @@ - Support for traits has been added. + Support for traits has been added. @@ -1491,7 +1491,7 @@ - It's now possible to enforce the class' __construct arguments in an abstract + It's now possible to enforce the class' __construct arguments in an abstract constructor in the base class. diff --git a/appendices/migration55.xml b/appendices/migration55.xml index 3262429bd489..2d58e981a999 100644 --- a/appendices/migration55.xml +++ b/appendices/migration55.xml @@ -171,9 +171,9 @@ if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) { Prior to PHP 5.5, cases existed where the - self, - parent, and - static + self, + parent, and + static keywords were treated in a case sensitive fashion. These have now been resolved, and these keywords are always handled case insensitively: SELF::CONSTANT is now treated identically to @@ -413,7 +413,7 @@ String dereferencing: P - Class name resolution via <link linkend="language.oop5.basic.class.class">::class</link> + Class name resolution via <link linkend="language.oop.basic.class.class">::class</link> It is possible to use ClassName::class to get a fully diff --git a/appendices/migration56/new-features.xml b/appendices/migration56/new-features.xml index a25fd47174f4..44fd9012aed8 100644 --- a/appendices/migration56/new-features.xml +++ b/appendices/migration56/new-features.xml @@ -342,7 +342,7 @@ bool(false) <literal>__debugInfo()</literal> - The __debugInfo() + The __debugInfo() magic method has been added to allow objects to change the properties and values that are shown when the object is output using var_dump. diff --git a/appendices/migration70/deprecated.xml b/appendices/migration70/deprecated.xml index 624381fb1e22..3868cb0e3dbb 100644 --- a/appendices/migration70/deprecated.xml +++ b/appendices/migration70/deprecated.xml @@ -51,7 +51,7 @@ Deprecated: Methods with the same name as their class will not be constructors i Static calls to non-static methods - Static calls to methods that + Static calls to methods that are not declared static are deprecated, and may be removed in the future. diff --git a/appendices/migration70/new-features.xml b/appendices/migration70/new-features.xml index 7f05505b58a8..fe47fa35d225 100644 --- a/appendices/migration70/new-features.xml +++ b/appendices/migration70/new-features.xml @@ -253,7 +253,7 @@ object(class@anonymous)#2 (0) { Full documentation can be found in the - anonymous class reference. + anonymous class reference. diff --git a/appendices/reserved.xml b/appendices/reserved.xml index ac59d56a4494..e337599a29d6 100644 --- a/appendices/reserved.xml +++ b/appendices/reserved.xml @@ -35,7 +35,7 @@ __halt_compiler - abstract + abstract and @@ -61,15 +61,15 @@ catch - class + class - clone + clone - const + const continue @@ -129,12 +129,12 @@ exit - extends + extends - final + final finally (as of PHP 5.5) @@ -163,7 +163,7 @@ if - implements + implements @@ -177,10 +177,10 @@ instanceof - insteadof (as of PHP 5.4) + insteadof (as of PHP 5.4) - interface + interface @@ -194,7 +194,7 @@ namespace (as of PHP 5.3) - new + new or @@ -205,13 +205,13 @@ print - private + private - protected + protected - public + public require @@ -236,7 +236,7 @@ - trait (as of PHP 5.4) + trait (as of PHP 5.4) try @@ -248,7 +248,7 @@ use - var + var @@ -496,7 +496,7 @@ self - Current + Current class. @@ -505,7 +505,7 @@ static - Current class in + Current class in runtime. @@ -514,7 +514,7 @@ parent - Parent + Parent class. diff --git a/appendices/tokens.xml b/appendices/tokens.xml index f22474a11dfa..2ce2714f87ab 100644 --- a/appendices/tokens.xml +++ b/appendices/tokens.xml @@ -45,7 +45,7 @@ T_ABSTRACT abstract - + T_AND_EQUAL @@ -115,7 +115,7 @@ T_CLASS class - classes and objects + classes and objects T_CLASS_C @@ -128,7 +128,7 @@ T_CLONE clone - classes and objects + classes and objects @@ -338,8 +338,8 @@ T_EXTENDS extends - extends, classes and objects + extends, classes and objects T_FILE @@ -349,7 +349,7 @@ T_FINAL final - + T_FINALLY @@ -409,7 +409,7 @@ T_IMPLEMENTS implements - + T_INC @@ -443,12 +443,12 @@ T_INSTEADOF insteadof - + T_INTERFACE interface - + T_INT_CAST @@ -555,7 +555,7 @@ T_NEW new - classes and objects + classes and objects T_NS_C @@ -585,12 +585,12 @@ T_OBJECT_OPERATOR -> - classes and objects + classes and objects T_NULLSAFE_OBJECT_OPERATOR ?-> - classes and objects + classes and objects T_OPEN_TAG @@ -613,7 +613,7 @@ T_PAAMAYIM_NEKUDOTAYIM :: - ::. Also defined as + ::. Also defined as T_DOUBLE_COLON. @@ -645,21 +645,21 @@ T_PRIVATE private - classes and objects + classes and objects T_PROTECTED protected - classes and objects + classes and objects T_PUBLIC public - classes and objects + classes and objects @@ -752,7 +752,7 @@ T_TRAIT trait - + T_TRAIT_C @@ -782,7 +782,7 @@ T_VAR var - classes and objects + classes and objects T_VARIABLE diff --git a/faq/general.xml b/faq/general.xml index 196be73c5edd..3dcc4b2323fb 100644 --- a/faq/general.xml +++ b/faq/general.xml @@ -55,7 +55,7 @@ is the successor to PHP/FI 2.0 and is a lot nicer. PHP 7 is the current generation of PHP, which uses the Zend engine 3 which, among other things, offers many additional - OOP features. + OOP features. diff --git a/features/commandline.xml b/features/commandline.xml index 2d7ca25d3c7d..82957982cbaf 100644 --- a/features/commandline.xml +++ b/features/commandline.xml @@ -1600,7 +1600,7 @@ php > - Autoloading is not + Autoloading is not available if using PHP in &cli; interactive mode. diff --git a/language-snippets.ent b/language-snippets.ent index 84ab9dea9e67..b10433901356 100644 --- a/language-snippets.ent +++ b/language-snippets.ent @@ -120,7 +120,7 @@ from one file system to another.'> Using this function will use any registered -autoloaders if the class is not already known.'> +autoloaders if the class is not already known.'> diff --git a/language/constants.xml b/language/constants.xml index f4aeda9a33cd..b610defbe054 100644 --- a/language/constants.xml +++ b/language/constants.xml @@ -230,7 +230,7 @@ echo ANIMALS[1]; // outputs "cat" &reftitle.seealso; - Class Constants + Class Constants @@ -339,7 +339,7 @@ echo ANIMALS[1]; // outputs "cat" &reftitle.seealso; - ::class + ::class get_class get_object_vars file_exists diff --git a/language/control-structures/foreach.xml b/language/control-structures/foreach.xml index 19583fb8a457..b15f89c52a13 100644 --- a/language/control-structures/foreach.xml +++ b/language/control-structures/foreach.xml @@ -32,7 +32,7 @@ foreach (iterable_expression as $key => $value) It is possible to - customize object iteration. + customize object iteration. diff --git a/language/exceptions.xml b/language/exceptions.xml index 7a7cd129535f..298530b49314 100644 --- a/language/exceptions.xml +++ b/language/exceptions.xml @@ -46,17 +46,17 @@ class Exception extends Throwable If a class extends the built-in Exception class and re-defines the constructor, it is highly recommended + linkend="language.oop.decon">constructor, it is highly recommended that it also call parent::__construct() + linkend="language.oop.paamayim-nekudotayim">parent::__construct() to ensure all available data has been properly assigned. The __toString() method can be overridden + linkend="language.oop.magic">__toString() method can be overridden to provide a custom output when the object is presented as a string. Exceptions cannot be cloned. Attempting to clone an Exception will result in a + linkend="language.oop.cloning">clone an Exception will result in a fatal E_ERROR error. @@ -282,7 +282,7 @@ echo "\n\n"; Internal PHP functions mainly use Error reporting, only modern - Object oriented + Object oriented extensions use exceptions. However, errors can be easily translated to exceptions with ErrorException. This technique only works with non-fatal errors, however. diff --git a/language/functions.xml b/language/functions.xml index 6bc703776d01..02fc576a0b2b 100644 --- a/language/functions.xml +++ b/language/functions.xml @@ -28,7 +28,7 @@ function foo($arg_1, $arg_2, /* ..., */ $arg_n) Any valid PHP code may appear inside a function, even other - functions and class + functions and class definitions. diff --git a/language/generators.xml b/language/generators.xml index 8741e29dd85a..b6655da90b6d 100644 --- a/language/generators.xml +++ b/language/generators.xml @@ -9,7 +9,7 @@ Generators provide an easy way to implement simple - iterators without the + iterators without the overhead or complexity of implementing a class that implements the Iterator interface. diff --git a/language/oop.xml b/language/oop.xml new file mode 100644 index 000000000000..56c981527b41 --- /dev/null +++ b/language/oop.xml @@ -0,0 +1,72 @@ + + + + Classes and Objects + + + Introduction + + PHP includes a complete object model. + Some of its features are: + visibility, + abstract and + final classes and methods, + additional magic methods, + interfaces, and + cloning. + + + PHP treats objects in the same way as references or handles, meaning that + each variable contains an object reference rather than a copy of the entire + object. See + Objects and References + + &tip.userlandnaming; + + + &language.oop.basic; + &language.oop.properties; + &language.oop.constants; + &language.oop.autoload; + &language.oop.decon; + &language.oop.visibility; + &language.oop.inheritance; + &language.oop.paamayim-nekudotayim; + &language.oop.static; + &language.oop.abstract; + &language.oop.interfaces; + &language.oop.traits; + &language.oop.anonymous; + &language.oop.overloading; + &language.oop.iterations; + &language.oop.magic; + &language.oop.final; + &language.oop.cloning; + &language.oop.object-comparison; + &language.oop.late-static-bindings; + &language.oop.references; + &language.oop.serialization; + &language.oop.variance; + &language.oop.changelog; + + + diff --git a/language/oop5/abstract.xml b/language/oop/abstract.xml similarity index 96% rename from language/oop5/abstract.xml rename to language/oop/abstract.xml index ed52d1bee043..9dcdc51706fb 100644 --- a/language/oop5/abstract.xml +++ b/language/oop/abstract.xml @@ -1,6 +1,6 @@ - + Class Abstraction @@ -15,7 +15,7 @@ When inheriting from an abstract class, all methods marked abstract in the parent's class declaration must be defined by the child; additionally, these methods must be defined with the same (or a less restricted) - visibility. For example, + visibility. For example, if the abstract method is defined as protected, the function implementation must be defined as either protected or public, but not private. Furthermore the signatures of the methods must match, i.e. the type hints and the number diff --git a/language/oop5/anonymous.xml b/language/oop/anonymous.xml similarity index 97% rename from language/oop5/anonymous.xml rename to language/oop/anonymous.xml index 67f550365fbc..019eeb1d1540 100644 --- a/language/oop5/anonymous.xml +++ b/language/oop/anonymous.xml @@ -1,7 +1,7 @@ - + Anonymous classes diff --git a/language/oop5/autoload.xml b/language/oop/autoload.xml similarity index 98% rename from language/oop5/autoload.xml rename to language/oop/autoload.xml index 15a8a47e9c13..504323678107 100644 --- a/language/oop5/autoload.xml +++ b/language/oop/autoload.xml @@ -1,6 +1,6 @@ - + Autoloading Classes Many developers writing object-oriented applications create diff --git a/language/oop5/basic.xml b/language/oop/basic.xml similarity index 92% rename from language/oop5/basic.xml rename to language/oop/basic.xml index 7d1bedc42b3b..289467831dd1 100644 --- a/language/oop5/basic.xml +++ b/language/oop/basic.xml @@ -1,10 +1,10 @@ - + The Basics - + class Basic class definitions begin with the @@ -22,7 +22,7 @@ A class may contain its - own constants, variables + own constants, variables (called "properties"), and functions (called "methods"). @@ -50,7 +50,7 @@ class SimpleClass context. $this is a reference to the calling object (usually the object to which the method belongs, but possibly another object, if the method is called - statically from the context + statically from the context of a secondary object). As of PHP 7.0.0 calling a non-static method statically from an incompatible context results in $this being undefined inside the method. Calling a @@ -60,7 +60,7 @@ class SimpleClass context). Before PHP 5.6.0 such calls already triggered a strict notice. - + Some examples of the <varname>$this</varname> pseudo-variable We're assuming that error_reporting is disabled for this example; @@ -126,12 +126,12 @@ $this is not defined. - + new To create an instance of a class, the new keyword must be used. An object will always be created unless the object has a - constructor defined that throws an + constructor defined that throws an exception on error. Classes should be defined before instantiation (and in some cases this is a requirement). @@ -173,7 +173,7 @@ $instance = new $className(); // new SimpleClass() will access the same instance as the object that was assigned. This behaviour is the same when passing instances to a function. A copy of an already created object can be made by - cloning it. + cloning it. Object Assignment @@ -279,7 +279,7 @@ echo (new DateTime())->format('Y'); - + Properties and methods Class properties and methods live in separate "namespaces", so it is @@ -356,7 +356,7 @@ echo ($obj->bar)(), PHP_EOL; - + extends A class can inherit the methods and properties of another class by @@ -368,10 +368,10 @@ echo ($obj->bar)(), PHP_EOL; The inherited methods and properties can be overridden by redeclaring them with the same name defined in the parent class. However, if the parent class has defined a method - as final, that method + as final, that method may not be overridden. It is possible to access the overridden methods or static properties by referencing them - with parent::. + with parent::. When overriding methods, the parameter signature should remain the same or @@ -409,7 +409,7 @@ a default value - + ::class @@ -420,7 +420,7 @@ a default value namespaced classes. - + Class name resolution - + Missing class name resolution get_class on the object. - + Object name resolution - + Nullsafe methods and properties As of PHP 8.0.0, properties and methods may also be accessed with the diff --git a/language/oop5/changelog.xml b/language/oop/changelog.xml similarity index 89% rename from language/oop5/changelog.xml rename to language/oop/changelog.xml index 015ba514e911..8c9c8c7fede4 100644 --- a/language/oop5/changelog.xml +++ b/language/oop/changelog.xml @@ -1,6 +1,6 @@ - + OOP Changelog Changes to the PHP OOP model are logged here. Descriptions and other notes regarding @@ -107,21 +107,21 @@ 7.1.0 Added: It is now possible to specify the - visibility of + visibility of class constants. 7.0.0 - Deprecated: Static calls + Deprecated: Static calls to methods that are not declared static. 7.0.0 - Deprecated: PHP 4 style + Deprecated: PHP 4 style constructor. I.e. methods that have the same name as the class they are defined in. @@ -138,7 +138,7 @@ 7.0.0 Added: Support for - anonymous classes + anonymous classes has been added via new class. @@ -154,7 +154,7 @@ 7.0.0 Changed: Defining (compatible) properties in two used - traits no longer + traits no longer triggers an error. @@ -167,7 +167,7 @@ 5.5.0 - Added: The ::class magic constant. + Added: The ::class magic constant. @@ -179,14 +179,14 @@ 5.4.0 - Added: traits. + Added: traits. 5.4.0 - Changed: If an abstract class - defines a signature for the + Changed: If an abstract class + defines a signature for the constructor it will now be enforced. @@ -196,7 +196,7 @@ Changed: Methods with the same name as the last element of a namespaced class name will no longer be treated as constructor. This change doesn't + linkend="language.oop.decon">constructor. This change doesn't affect non-namespaced classes. @@ -221,8 +221,8 @@ 5.3.0 Changed: An E_WARNING level error is issued if - the magic overloading - methods are declared static. + the magic overloading + methods are declared static. It also enforces the public visibility requirement. @@ -242,7 +242,7 @@ 5.3.0 - Added: The __callStatic method. + Added: The __callStatic method. @@ -258,7 +258,7 @@ 5.3.0 - Added: Late Static Bindings. + Added: Late Static Bindings. diff --git a/language/oop5/cloning.xml b/language/oop/cloning.xml similarity index 98% rename from language/oop5/cloning.xml rename to language/oop/cloning.xml index acb806429465..38606117be7d 100644 --- a/language/oop5/cloning.xml +++ b/language/oop/cloning.xml @@ -1,6 +1,6 @@ - + Object Cloning diff --git a/language/oop5/constants.xml b/language/oop/constants.xml similarity index 95% rename from language/oop5/constants.xml rename to language/oop/constants.xml index 928c8441cbc0..dce3115f1353 100644 --- a/language/oop5/constants.xml +++ b/language/oop/constants.xml @@ -1,6 +1,6 @@  - + Class Constants It is possible to define constant values on a per-class basis remaining the @@ -14,7 +14,7 @@ It's also possible for interfaces to have constants. Look at - the interface documentation for + the interface documentation for examples. diff --git a/language/oop5/decon.xml b/language/oop/decon.xml similarity index 97% rename from language/oop5/decon.xml rename to language/oop/decon.xml index a8222a9f16f4..92b7835ea50f 100644 --- a/language/oop5/decon.xml +++ b/language/oop/decon.xml @@ -1,9 +1,9 @@ - + Constructors and Destructors - + Constructor void__construct @@ -117,7 +117,7 @@ $p3 = new Point(y: 5, x: 4); Always use __construct() in new code. - + Constructor Promotion As of PHP 8.0.0, constructor parameters may also be promoted to correspond to an @@ -163,7 +163,7 @@ class Point { - + Static creation methods PHP only supports a single constructor per class. In some cases, however, it may be @@ -236,7 +236,7 @@ $p3 = Product::fromXml($some_xml_string); - + Destructor void__destruct diff --git a/language/oop5/final.xml b/language/oop/final.xml similarity index 96% rename from language/oop5/final.xml rename to language/oop/final.xml index d598a6ca6e94..4e8e1540b8ea 100644 --- a/language/oop5/final.xml +++ b/language/oop/final.xml @@ -1,6 +1,6 @@ - + Final Keyword PHP 5 introduces the final keyword, which prevents child classes from diff --git a/language/oop5/inheritance.xml b/language/oop/inheritance.xml similarity index 91% rename from language/oop5/inheritance.xml rename to language/oop/inheritance.xml index 34affdadabce..3e1b841b8bd9 100644 --- a/language/oop5/inheritance.xml +++ b/language/oop/inheritance.xml @@ -1,6 +1,6 @@ - + Object Inheritance Inheritance is a well-established programming principle, and PHP makes use @@ -27,8 +27,8 @@ - - + + Inheritance Example - + Object Interfaces Object interfaces allow you to create code which specifies which methods a @@ -18,10 +18,10 @@ Note that it is possible to declare a constructor in an interface, + linkend="language.oop.decon.constructor">constructor in an interface, which can be useful in some contexts, e.g. for use by factories. - + <literal>implements</literal> To implement an interface, the implements operator is used. @@ -39,7 +39,7 @@ - Interfaces can be extended like classes using the extends + Interfaces can be extended like classes using the extends operator. @@ -51,17 +51,17 @@ - + <literal>Constants</literal> It's possible for interfaces to have constants. Interface constants work exactly - like class constants except + like class constants except they cannot be overridden by a class/interface that inherits them. - + &reftitle.examples; - + Interface example - + Extendable Interfaces - + Multiple interface inheritance - + Interfaces with constants - + Object Iteration PHP 5 provides a way for objects to be defined so it is possible to iterate through a list of items, with, for example a &foreach; statement. By default, - all visible properties will be used + all visible properties will be used for the iteration. @@ -66,12 +66,12 @@ private => private var As the output shows, the &foreach; iterated through all of the - visible properties that could be + visible properties that could be accessed. To take it a step further, the Iterator - interface may be implemented. + interface may be implemented. This allows the object to dictate how it will be iterated and what values will be available on each iteration. @@ -165,7 +165,7 @@ valid: The IteratorAggregate - interface + interface can be used as an alternative to implementing all of the Iterator methods. IteratorAggregate only requires the diff --git a/language/oop5/late-static-bindings.xml b/language/oop/late-static-bindings.xml similarity index 95% rename from language/oop5/late-static-bindings.xml rename to language/oop/late-static-bindings.xml index c471077f8808..0d5688f4b402 100644 --- a/language/oop5/late-static-bindings.xml +++ b/language/oop/late-static-bindings.xml @@ -1,6 +1,6 @@ - + Late Static Bindings As of PHP 5.3.0, PHP implements a feature called late static bindings which @@ -11,7 +11,7 @@ More precisely, late static bindings work by storing the class named in the last "non-forwarding call". In case of static method calls, this is the class explicitly named (usually the one on the left of the - :: + :: operator); in case of non static method calls, it is the class of the object. A "forwarding call" is a static one that is introduced by self::, parent::, static::, or, if going @@ -33,7 +33,7 @@ limited to) static method calls. - + Limitations of <literal>self::</literal> Static references to the current class like self:: or @@ -74,7 +74,7 @@ A - + Late Static Bindings' usage diff --git a/language/oop5/magic.xml b/language/oop/magic.xml similarity index 97% rename from language/oop5/magic.xml rename to language/oop/magic.xml index 0cf8d553135b..9dad5b22054f 100644 --- a/language/oop5/magic.xml +++ b/language/oop/magic.xml @@ -1,6 +1,6 @@ - + Magic Methods The function names @@ -41,7 +41,7 @@ - + <link linkend="object.sleep">__sleep()</link> and <link linkend="object.wakeup">__wakeup()</link> @@ -129,7 +129,7 @@ class Connection </example> </sect2> - <sect2 xml:id="language.oop5.magic.serialize"> + <sect2 xml:id="language.oop.magic.serialize"> <title> <link linkend="object.serialize">__serialize()</link> and <link linkend="object.unserialize">__unserialize()</link> @@ -230,7 +230,7 @@ class Connection </example> </sect2> - <sect2 xml:id="language.oop5.magic.tostring"> + <sect2 xml:id="language.oop.magic.tostring"> <title><link linkend="object.tostring">__toString()</link> public string__toString @@ -295,7 +295,7 @@ Hello - + <link linkend="object.invoke">__invoke()</link> mixed__invoke @@ -338,14 +338,14 @@ bool(true) - + <link linkend="object.set-state">__set_state()</link> static object__set_state arrayproperties - This static method is called + This static method is called for classes exported by var_export since PHP 5.1.0. @@ -412,7 +412,7 @@ object(A)#2 (2) { - + <link linkend="object.debuginfo">__debugInfo()</link> array__debugInfo diff --git a/language/oop5/object-comparison.xml b/language/oop/object-comparison.xml similarity index 96% rename from language/oop5/object-comparison.xml rename to language/oop/object-comparison.xml index f261c0de209e..cfe44e9b3b30 100644 --- a/language/oop5/object-comparison.xml +++ b/language/oop/object-comparison.xml @@ -1,6 +1,6 @@ - + Comparing Objects When using the comparison operator (==), diff --git a/language/oop5/overloading.xml b/language/oop/overloading.xml similarity index 96% rename from language/oop5/overloading.xml rename to language/oop/overloading.xml index c0acd285dd44..a43b30cd3d1a 100644 --- a/language/oop5/overloading.xml +++ b/language/oop/overloading.xml @@ -1,6 +1,6 @@ - + Overloading @@ -13,7 +13,7 @@ The overloading methods are invoked when interacting with properties or methods that have not been declared or are not - visible in + visible in the current scope. The rest of this section will use the terms inaccessible properties and inaccessible methods to refer to this combination of declaration @@ -43,7 +43,7 @@ - + &reftitle.changelog; @@ -82,7 +82,7 @@ - + Property overloading @@ -137,7 +137,7 @@ Property overloading only works in object context. These magic methods will not be triggered in static context. Therefore these methods should not be declared - static. As of PHP + static. As of PHP 5.3.0, a warning is issued if one of the magic overloading methods is declared static. @@ -267,7 +267,7 @@ Notice: Undefined property via __get(): hidden in on line 70 in o - + Method overloading diff --git a/language/oop5/paamayim-nekudotayim.xml b/language/oop/paamayim-nekudotayim.xml similarity index 86% rename from language/oop5/paamayim-nekudotayim.xml rename to language/oop/paamayim-nekudotayim.xml index 15bd6d77c31a..000f593a2940 100644 --- a/language/oop5/paamayim-nekudotayim.xml +++ b/language/oop/paamayim-nekudotayim.xml @@ -1,13 +1,13 @@ - + Scope Resolution Operator (::) The Scope Resolution Operator (also called Paamayim Nekudotayim) or in simpler terms, the double colon, is a token that allows access to - static, - constant, and overridden + static, + constant, and overridden properties or methods of a class. @@ -81,9 +81,9 @@ OtherClass::doubleColon(); When an extending class overrides the parents definition of a method, PHP will not call the parent's method. It's up to the extended class on whether or not the parent's method is called. This also applies to Constructors and Destructors, Overloading, and Magic method definitions. + linkend="language.oop.decon">Constructors and Destructors, Overloading, and Magic method definitions. @@ -116,7 +116,7 @@ $class->myFunc(); - See also some examples of + See also some examples of static call trickery. diff --git a/language/oop5/properties.xml b/language/oop/properties.xml similarity index 95% rename from language/oop5/properties.xml rename to language/oop/properties.xml index d5d5e68267ca..9854e57d8b69 100644 --- a/language/oop5/properties.xml +++ b/language/oop/properties.xml @@ -1,6 +1,6 @@ - + Properties @@ -16,7 +16,7 @@ must not depend on run-time information in order to be evaluated. - See for more + See for more information on the meanings of public, protected, and private. @@ -45,7 +45,7 @@ -> (Object Operator): $this->property (where property is the name of the property). Static properties are accessed by using the :: (Double Colon): - self::$property. See Static Keyword + self::$property. See Static Keyword for more information on the difference between static and non-static properties. @@ -54,7 +54,7 @@ context. $this is a reference to the calling object (usually the object to which the method belongs, but possibly another object, if the method is called - statically from the context + statically from the context of a secondary object). @@ -101,7 +101,7 @@ EOD; - + Heredoc and Nowdoc As of PHP 5.3.0 @@ -135,7 +135,7 @@ EOT; - + Type declarations As of PHP 7.4.0, property definitions can include a type declaration. @@ -236,7 +236,7 @@ Fatal error: Uncaught Error: Typed property Shape::$numberOfSides must not be ac - + Valid property types diff --git a/language/oop5/references.xml b/language/oop/references.xml similarity index 95% rename from language/oop5/references.xml rename to language/oop/references.xml index a1b528b22727..17d7cc2f4616 100644 --- a/language/oop5/references.xml +++ b/language/oop/references.xml @@ -1,6 +1,6 @@ - + Objects and references One of the key-points of PHP 5 OOP that is often mentioned is that diff --git a/language/oop5/serialization.xml b/language/oop/serialization.xml similarity index 97% rename from language/oop5/serialization.xml rename to language/oop/serialization.xml index c0fe33f63658..920d77203872 100644 --- a/language/oop5/serialization.xml +++ b/language/oop/serialization.xml @@ -1,6 +1,6 @@ - + Object Serialization Serializing objects - objects in sessions diff --git a/language/oop5/static.xml b/language/oop/static.xml similarity index 92% rename from language/oop5/static.xml rename to language/oop/static.xml index c7952eed8d2b..3ac34b7ec1e2 100644 --- a/language/oop5/static.xml +++ b/language/oop/static.xml @@ -1,6 +1,6 @@ - + Static Keyword @@ -10,7 +10,7 @@ be used to define static variables and for - late static bindings. + late static bindings. Please refer to those pages for information on those meanings of static. @@ -25,12 +25,12 @@ For compatibility with PHP 4, if no visibility + linkend="language.oop.visibility">visibility declaration is used, then the property or method will be treated as if it was declared as public. - + Static methods @@ -74,7 +74,7 @@ $classname::aStaticMethod(); // As of PHP 5.3.0 - + Static properties diff --git a/language/oop5/traits.xml b/language/oop/traits.xml similarity index 89% rename from language/oop5/traits.xml rename to language/oop/traits.xml index 11872bb2811d..c80ba40870fb 100644 --- a/language/oop5/traits.xml +++ b/language/oop/traits.xml @@ -1,6 +1,6 @@ - + Traits As of PHP 5.4.0, PHP implements a method of code reuse called Traits. @@ -20,7 +20,7 @@ composition of behavior; that is, the application of class members without requiring inheritance. - + Trait example - + Precedence An inherited member from a base class is overridden by a member inserted by a Trait. The precedence order is that members from the current class override Trait methods, which in turn override inherited methods. - + Precedence Order Example An inherited method from a base class is overridden by the @@ -92,7 +92,7 @@ Hello World! ]]> - + Alternate Precedence Order Example - + Multiple Traits Multiple Traits can be inserted into a class by listing them in the use statement, separated by commas. - + Multiple Traits Usage - + Conflict Resolution If two Traits insert a method with the same name, a fatal error is produced, @@ -187,7 +187,7 @@ Hello World! as operator does not rename the method and it does not affect any other method either. - + Conflict Resolution In this example, Talker uses the traits A and B. @@ -248,13 +248,13 @@ class Aliased_Talker { - + Changing Method Visibility Using the as syntax, one can also adjust the visibility of the method in the exhibiting class. - + Changing Method Visibility - + Traits Composed from Traits Just as classes can make use of traits, so can other traits. By using one or more traits in a trait definition, it can be composed partially or entirely of the members defined in those other traits. - + Traits Composed from Traits - + Abstract Trait Members Traits support the use of abstract methods in order to impose requirements @@ -340,7 +340,7 @@ Hello World! with the same name; its signature may be different. - + Express Requirements by Abstract Methods - + Static Trait Members Traits can define both static members and static methods. - + Static Variables inc(); // echo 1 ]]> - + Static Methods - + Properties Traits can also define properties. - + Defining Properties x; Before PHP 7.0.0, defining a property in the class with the same visibility and initial value as in the trait, raised an E_STRICT notice. - + Conflict Resolution - + Covariance and Contravariance @@ -14,7 +14,7 @@ specific in a child method, than that of its parent. - + Covariance @@ -109,7 +109,7 @@ Mavrick barks - + Contravariance diff --git a/language/oop5/visibility.xml b/language/oop/visibility.xml similarity index 96% rename from language/oop5/visibility.xml rename to language/oop/visibility.xml index 5c8334dbe45b..83152348da4c 100644 --- a/language/oop5/visibility.xml +++ b/language/oop/visibility.xml @@ -1,6 +1,6 @@ - + Visibility The visibility of a property, a method or (as of PHP 7.1.0) a constant can be defined by prefixing @@ -13,7 +13,7 @@ class that defines the member. - + Property Visibility Class properties must be defined as public, private, or @@ -88,7 +88,7 @@ $obj2->printHello(); // Shows Public2, Protected2, Undefined - + Method Visibility Class methods may be defined as public, private, or @@ -189,7 +189,7 @@ $myFoo->test(); // Bar::testPrivate - + Constant Visibility As of PHP 7.1.0, class constants may be defined as public, private, or @@ -255,7 +255,7 @@ $myclass2->foo2(); // Public and Protected work, not Private - + Visibility from other objects Objects of the same type will have access to each others private and diff --git a/language/oop5.xml b/language/oop5.xml deleted file mode 100644 index af325dce4103..000000000000 --- a/language/oop5.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - Classes and Objects - - - Introduction - - PHP includes a complete object model. - Some of its features are: - visibility, - abstract and - final classes and methods, - additional magic methods, - interfaces, and - cloning. - - - PHP treats objects in the same way as references or handles, meaning that - each variable contains an object reference rather than a copy of the entire - object. See - Objects and References - - &tip.userlandnaming; - - - &language.oop5.basic; - &language.oop5.properties; - &language.oop5.constants; - &language.oop5.autoload; - &language.oop5.decon; - &language.oop5.visibility; - &language.oop5.inheritance; - &language.oop5.paamayim-nekudotayim; - &language.oop5.static; - &language.oop5.abstract; - &language.oop5.interfaces; - &language.oop5.traits; - &language.oop5.anonymous; - &language.oop5.overloading; - &language.oop5.iterations; - &language.oop5.magic; - &language.oop5.final; - &language.oop5.cloning; - &language.oop5.object-comparison; - &language.oop5.late-static-bindings; - &language.oop5.references; - &language.oop5.serialization; - &language.oop5.variance; - &language.oop5.changelog; - - - diff --git a/language/operators.xml b/language/operators.xml index 6f67017e900b..095788dbee8e 100644 --- a/language/operators.xml +++ b/language/operators.xml @@ -83,7 +83,7 @@ clone new - clone and new + clone and new right @@ -528,7 +528,7 @@ $b .= "There!"; // sets $b to "Hello There!", just like $b = $b . "There!"; An exception to the usual assignment by value behaviour within PHP occurs with objects, which are assigned by reference. Objects may be explicitly copied via the clone keyword. + linkend="language.oop.cloning">clone keyword. @@ -562,9 +562,9 @@ print "$b\n"; // prints 4 as well, since $b is a reference to $a, which has - The new + The new operator returns a reference automatically, as such assigning the result of - new by reference is an error. + new by reference is an error. @@ -1369,7 +1369,7 @@ Expression: 0 = -4 << 62 &reftitle.seealso; - + pack unpack gmp_and @@ -1592,7 +1592,7 @@ echo $a <=> $b; // 1 object Built-in classes can define its own comparison, different classes are uncomparable, same class see Object Comparison + linkend="language.oop.object-comparison">Object Comparison @@ -2391,7 +2391,7 @@ var_dump($a === $b); // bool(false) instanceof is used to determine whether a PHP variable is an instantiated object of a certain - class: + class: Using <literal>instanceof</literal> with classes @@ -2482,7 +2482,7 @@ bool(true) Lastly, instanceof can also be used to determine whether a variable is an instantiated object of a class that implements an - interface: + interface: Using <literal>instanceof</literal> with interfaces diff --git a/language/predefined/closure.xml b/language/predefined/closure.xml index 7fbe15b18985..67dd67461d32 100644 --- a/language/predefined/closure.xml +++ b/language/predefined/closure.xml @@ -25,7 +25,7 @@ Besides the methods listed here, this class also has an __invoke method. This is for consistency with other - classes that implement calling + classes that implement calling magic, as this method is not used for calling the function. diff --git a/language/predefined/closure/bindto.xml b/language/predefined/closure/bindto.xml index 7a380b523d52..f6d7ff7fc16d 100644 --- a/language/predefined/closure/bindto.xml +++ b/language/predefined/closure/bindto.xml @@ -50,7 +50,7 @@ If you only want to duplicate the anonymous functions, you can use - cloning instead. + cloning instead. diff --git a/language/predefined/generator.xml b/language/predefined/generator.xml index c9ab409405fa..c813896aefa3 100644 --- a/language/predefined/generator.xml +++ b/language/predefined/generator.xml @@ -19,7 +19,7 @@ Generator objects cannot be instantiated via - new. + new. diff --git a/language/predefined/serializable/unserialize.xml b/language/predefined/serializable/unserialize.xml index ff89786e36a1..b41855f221e2 100644 --- a/language/predefined/serializable/unserialize.xml +++ b/language/predefined/serializable/unserialize.xml @@ -19,7 +19,7 @@ This method acts as the - constructor of the object. The + constructor of the object. The __construct() method will not be called after this method. diff --git a/language/references.xml b/language/references.xml index 4d45a073dc3c..b22e1fc80c3b 100644 --- a/language/references.xml +++ b/language/references.xml @@ -95,9 +95,9 @@ $foo =& find_var($bar); ]]> - new + new returns a reference automatically, thus it is syntactically invalid. - For more information, see Objects + For more information, see Objects and references.) diff --git a/language/types/object.xml b/language/types/object.xml index c0944ea37175..c9d84425f91d 100644 --- a/language/types/object.xml +++ b/language/types/object.xml @@ -32,7 +32,7 @@ $bar->do_foo(); For a full discussion, see the - Classes and Objects chapter. + Classes and Objects chapter. diff --git a/language/types/string.xml b/language/types/string.xml index a9c6df6fbd9a..1ab22a0fc88c 100644 --- a/language/types/string.xml +++ b/language/types/string.xml @@ -1018,7 +1018,7 @@ bool(false) In order to convert objects to string magic - method __toString must be used. + method __toString must be used. diff --git a/reference/array/functions/each.xml b/reference/array/functions/each.xml index 9b0705e6fb77..c03699a66f7b 100644 --- a/reference/array/functions/each.xml +++ b/reference/array/functions/each.xml @@ -174,7 +174,7 @@ c => cranberry next prev &foreach; - Object Iteration + Object Iteration diff --git a/reference/classobj/functions/autoload.xml b/reference/classobj/functions/autoload.xml index 49ace6f49b21..029478bf6d10 100644 --- a/reference/classobj/functions/autoload.xml +++ b/reference/classobj/functions/autoload.xml @@ -19,7 +19,7 @@ You can define this function to enable classes autoloading. + linkend="language.oop.autoload">classes autoloading. diff --git a/reference/classobj/functions/property-exists.xml b/reference/classobj/functions/property-exists.xml index 9933874fb8db..ccdb3309a078 100644 --- a/reference/classobj/functions/property-exists.xml +++ b/reference/classobj/functions/property-exists.xml @@ -64,7 +64,7 @@ The property_exists function cannot detect properties that are magically accessible using the __get + linkend="language.oop.overloading.members">__get magic method. diff --git a/reference/dir/directory.xml b/reference/dir/directory.xml index 64da09528a92..5bb2ab20a323 100644 --- a/reference/dir/directory.xml +++ b/reference/dir/directory.xml @@ -14,7 +14,7 @@ Instances of Directory are created by calling the dir function, not by the new operator. + linkend="language.oop.basic.new">new operator. diff --git a/reference/errorfunc/functions/debug-backtrace.xml b/reference/errorfunc/functions/debug-backtrace.xml index 4b07e44a5629..3c6f404453aa 100644 --- a/reference/errorfunc/functions/debug-backtrace.xml +++ b/reference/errorfunc/functions/debug-backtrace.xml @@ -111,7 +111,7 @@ class string - The current class name. See also + The current class name. See also __CLASS__ @@ -119,7 +119,7 @@ object object - The current object. + The current object. diff --git a/reference/ffi/ffi.cdata.xml b/reference/ffi/ffi.cdata.xml index 8940af43fe21..ab3ef81d1cc2 100644 --- a/reference/ffi/ffi.cdata.xml +++ b/reference/ffi/ffi.cdata.xml @@ -73,7 +73,7 @@ - Any C data can be duplicated using the clone + Any C data can be duplicated using the clone operator, e.g. $cdata2 = clone $cdata; diff --git a/reference/funchand/functions/forward-static-call-array.xml b/reference/funchand/functions/forward-static-call-array.xml index 59b61ba5297e..9730d1b2766c 100644 --- a/reference/funchand/functions/forward-static-call-array.xml +++ b/reference/funchand/functions/forward-static-call-array.xml @@ -17,7 +17,7 @@ Calls a user defined function or method given by the function parameter. This function must be called within a method context, it can't be used outside a class. - It uses the late static + It uses the late static binding. All arguments of the forwarded method are passed as values, and as an array, similarly to call_user_func_array. diff --git a/reference/funchand/functions/forward-static-call.xml b/reference/funchand/functions/forward-static-call.xml index 637e13bb7b61..1fbcf7525fbc 100644 --- a/reference/funchand/functions/forward-static-call.xml +++ b/reference/funchand/functions/forward-static-call.xml @@ -17,7 +17,7 @@ Calls a user defined function or method given by the function parameter, with the following arguments. This function must be called within a method context, it can't be used outside a class. - It uses the late static + It uses the late static binding. diff --git a/reference/imagick/imagick/clone.xml b/reference/imagick/imagick/clone.xml index 9d0bc123c94a..4478d7d0819a 100644 --- a/reference/imagick/imagick/clone.xml +++ b/reference/imagick/imagick/clone.xml @@ -18,7 +18,7 @@ This function has been DEPRECATED as of imagick 3.1.0 - in favour of using the clone + in favour of using the clone keyword. @@ -67,7 +67,7 @@ $newImage = clone $image; PECL imagick 3.1.0 The method was deprecated in favour of the - clone keyword. + clone keyword. diff --git a/reference/intl/intlcalendar/construct.xml b/reference/intl/intlcalendar/construct.xml index 6f4930fb3cd0..1ab03509eee9 100644 --- a/reference/intl/intlcalendar/construct.xml +++ b/reference/intl/intlcalendar/construct.xml @@ -15,7 +15,7 @@ A private constructor for disallowing instantiation with the - new operator. + new operator. Call IntlCalendar::createInstance instead. diff --git a/reference/intl/transliterator/construct.xml b/reference/intl/transliterator/construct.xml index 8b019a95ab87..b6b20c845dfe 100644 --- a/reference/intl/transliterator/construct.xml +++ b/reference/intl/transliterator/construct.xml @@ -15,7 +15,7 @@ This method should not be called. Its only purpose is to deny instantiation - with the new operator. + with the new operator. Use the factory methods Transliterator::create or diff --git a/reference/misc/functions/constant.xml b/reference/misc/functions/constant.xml index 538562c918b6..f08210669e16 100644 --- a/reference/misc/functions/constant.xml +++ b/reference/misc/functions/constant.xml @@ -23,7 +23,7 @@ This function works also with class constants. + linkend="language.oop.constants">class constants. diff --git a/reference/misc/functions/exit.xml b/reference/misc/functions/exit.xml index 496ca78634c8..91d5c4c19fec 100644 --- a/reference/misc/functions/exit.xml +++ b/reference/misc/functions/exit.xml @@ -19,7 +19,7 @@ Terminates execution of the script. Shutdown functions - and object destructors + and object destructors will always be executed even if exit is called. diff --git a/reference/mongodb/bson/binary/serialize.xml b/reference/mongodb/bson/binary/serialize.xml index 1609dc625f10..73779ac5bc27 100644 --- a/reference/mongodb/bson/binary/serialize.xml +++ b/reference/mongodb/bson/binary/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Binary::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/binary/unserialize.xml b/reference/mongodb/bson/binary/unserialize.xml index b74060775525..5b59f56bec04 100644 --- a/reference/mongodb/bson/binary/unserialize.xml +++ b/reference/mongodb/bson/binary/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\Binary::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/dbpointer/serialize.xml b/reference/mongodb/bson/dbpointer/serialize.xml index 2a767f8d1451..21090c1a2c9e 100644 --- a/reference/mongodb/bson/dbpointer/serialize.xml +++ b/reference/mongodb/bson/dbpointer/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\DBPointer::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/dbpointer/unserialize.xml b/reference/mongodb/bson/dbpointer/unserialize.xml index c357dea8157f..89a9a168b299 100644 --- a/reference/mongodb/bson/dbpointer/unserialize.xml +++ b/reference/mongodb/bson/dbpointer/unserialize.xml @@ -50,7 +50,7 @@ MongoDB\BSON\DBPointer::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/decimal128/serialize.xml b/reference/mongodb/bson/decimal128/serialize.xml index fa621d504d39..1f367b38af2f 100644 --- a/reference/mongodb/bson/decimal128/serialize.xml +++ b/reference/mongodb/bson/decimal128/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Decimal128::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/decimal128/unserialize.xml b/reference/mongodb/bson/decimal128/unserialize.xml index 4854447a8d14..2a00088ba58b 100644 --- a/reference/mongodb/bson/decimal128/unserialize.xml +++ b/reference/mongodb/bson/decimal128/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\Decimal128::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/int64/serialize.xml b/reference/mongodb/bson/int64/serialize.xml index 73ee42ca1300..f08915aa5184 100644 --- a/reference/mongodb/bson/int64/serialize.xml +++ b/reference/mongodb/bson/int64/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Int64::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/int64/unserialize.xml b/reference/mongodb/bson/int64/unserialize.xml index 23a9f6b2dc8a..c882113870d0 100644 --- a/reference/mongodb/bson/int64/unserialize.xml +++ b/reference/mongodb/bson/int64/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\Int64::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/javascript/serialize.xml b/reference/mongodb/bson/javascript/serialize.xml index 39269f520eba..e8214388738c 100644 --- a/reference/mongodb/bson/javascript/serialize.xml +++ b/reference/mongodb/bson/javascript/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Javascript::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/javascript/unserialize.xml b/reference/mongodb/bson/javascript/unserialize.xml index d2fe0e58f53d..48d431d35b0f 100644 --- a/reference/mongodb/bson/javascript/unserialize.xml +++ b/reference/mongodb/bson/javascript/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\Javascript::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/maxkey/serialize.xml b/reference/mongodb/bson/maxkey/serialize.xml index 6b5d683daa92..9dd6ba2dec54 100644 --- a/reference/mongodb/bson/maxkey/serialize.xml +++ b/reference/mongodb/bson/maxkey/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\MaxKey::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/maxkey/unserialize.xml b/reference/mongodb/bson/maxkey/unserialize.xml index 0633194b9ada..02e66e2bcb36 100644 --- a/reference/mongodb/bson/maxkey/unserialize.xml +++ b/reference/mongodb/bson/maxkey/unserialize.xml @@ -50,7 +50,7 @@ MongoDB\BSON\MaxKey::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/minkey/serialize.xml b/reference/mongodb/bson/minkey/serialize.xml index cca5ea87a557..2cd29f789a4a 100644 --- a/reference/mongodb/bson/minkey/serialize.xml +++ b/reference/mongodb/bson/minkey/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\MinKey::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/minkey/unserialize.xml b/reference/mongodb/bson/minkey/unserialize.xml index 471176c945dc..ba8a0c2cc7b3 100644 --- a/reference/mongodb/bson/minkey/unserialize.xml +++ b/reference/mongodb/bson/minkey/unserialize.xml @@ -50,7 +50,7 @@ MongoDB\BSON\MinKey::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/objectid/serialize.xml b/reference/mongodb/bson/objectid/serialize.xml index 9eca3759f0c2..aba37bb1405e 100644 --- a/reference/mongodb/bson/objectid/serialize.xml +++ b/reference/mongodb/bson/objectid/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\ObjectId::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/objectid/unserialize.xml b/reference/mongodb/bson/objectid/unserialize.xml index 20b097716e84..d1f09b898f4d 100644 --- a/reference/mongodb/bson/objectid/unserialize.xml +++ b/reference/mongodb/bson/objectid/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\ObjectId::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/regex/serialize.xml b/reference/mongodb/bson/regex/serialize.xml index 2e94c4148eca..d2f143de920f 100644 --- a/reference/mongodb/bson/regex/serialize.xml +++ b/reference/mongodb/bson/regex/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Regex::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/regex/unserialize.xml b/reference/mongodb/bson/regex/unserialize.xml index 66fa43fa5212..2a1f051746bd 100644 --- a/reference/mongodb/bson/regex/unserialize.xml +++ b/reference/mongodb/bson/regex/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\Regex::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/symbol/serialize.xml b/reference/mongodb/bson/symbol/serialize.xml index 355df2d3bc7b..57294fb8f982 100644 --- a/reference/mongodb/bson/symbol/serialize.xml +++ b/reference/mongodb/bson/symbol/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Symbol::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/symbol/unserialize.xml b/reference/mongodb/bson/symbol/unserialize.xml index 1854a63643b2..8b88f6fccd5a 100644 --- a/reference/mongodb/bson/symbol/unserialize.xml +++ b/reference/mongodb/bson/symbol/unserialize.xml @@ -50,7 +50,7 @@ MongoDB\BSON\Symbol::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/timestamp/serialize.xml b/reference/mongodb/bson/timestamp/serialize.xml index a50793030170..61385971b1e8 100644 --- a/reference/mongodb/bson/timestamp/serialize.xml +++ b/reference/mongodb/bson/timestamp/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Timestamp::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/timestamp/unserialize.xml b/reference/mongodb/bson/timestamp/unserialize.xml index d7d854a5db38..d8d5c9578ce5 100644 --- a/reference/mongodb/bson/timestamp/unserialize.xml +++ b/reference/mongodb/bson/timestamp/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\Timestamp::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/undefined/serialize.xml b/reference/mongodb/bson/undefined/serialize.xml index ed15c630cb71..6f4bec166b2f 100644 --- a/reference/mongodb/bson/undefined/serialize.xml +++ b/reference/mongodb/bson/undefined/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\Undefined::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/undefined/unserialize.xml b/reference/mongodb/bson/undefined/unserialize.xml index 0a1b38831010..6bcc4a98c146 100644 --- a/reference/mongodb/bson/undefined/unserialize.xml +++ b/reference/mongodb/bson/undefined/unserialize.xml @@ -50,7 +50,7 @@ MongoDB\BSON\Undefined::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/unserializable/bsonunserialize.xml b/reference/mongodb/bson/unserializable/bsonunserialize.xml index 8b8f16c8518c..22f685ce97ab 100644 --- a/reference/mongodb/bson/unserializable/bsonunserialize.xml +++ b/reference/mongodb/bson/unserializable/bsonunserialize.xml @@ -24,7 +24,7 @@ This method acts as the - constructor of the + constructor of the object. The __construct() method will not be called after this method. diff --git a/reference/mongodb/bson/utcdatetime/serialize.xml b/reference/mongodb/bson/utcdatetime/serialize.xml index 2f924db30a91..916a913c0623 100644 --- a/reference/mongodb/bson/utcdatetime/serialize.xml +++ b/reference/mongodb/bson/utcdatetime/serialize.xml @@ -40,7 +40,7 @@ MongoDB\BSON\UTCDateTime::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/bson/utcdatetime/unserialize.xml b/reference/mongodb/bson/utcdatetime/unserialize.xml index a1779e4d4bf6..fcd51ff3d1bc 100644 --- a/reference/mongodb/bson/utcdatetime/unserialize.xml +++ b/reference/mongodb/bson/utcdatetime/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\BSON\UTCDateTime::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/cursorid/serialize.xml b/reference/mongodb/mongodb/driver/cursorid/serialize.xml index ba58bc1f70a9..94121899e1f5 100644 --- a/reference/mongodb/mongodb/driver/cursorid/serialize.xml +++ b/reference/mongodb/mongodb/driver/cursorid/serialize.xml @@ -40,7 +40,7 @@ MongoDB\Driver\CursorId::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/cursorid/unserialize.xml b/reference/mongodb/mongodb/driver/cursorid/unserialize.xml index 27c2495287e8..2dc92577b51e 100644 --- a/reference/mongodb/mongodb/driver/cursorid/unserialize.xml +++ b/reference/mongodb/mongodb/driver/cursorid/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\Driver\CursorId::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/readconcern/serialize.xml b/reference/mongodb/mongodb/driver/readconcern/serialize.xml index 1fe9467baed7..d80f78d88e34 100644 --- a/reference/mongodb/mongodb/driver/readconcern/serialize.xml +++ b/reference/mongodb/mongodb/driver/readconcern/serialize.xml @@ -40,7 +40,7 @@ MongoDB\Driver\ReadConcern::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/readconcern/unserialize.xml b/reference/mongodb/mongodb/driver/readconcern/unserialize.xml index 8ca3f885f589..4546f6d07821 100644 --- a/reference/mongodb/mongodb/driver/readconcern/unserialize.xml +++ b/reference/mongodb/mongodb/driver/readconcern/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\Driver\ReadConcern::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/readpreference/serialize.xml b/reference/mongodb/mongodb/driver/readpreference/serialize.xml index 5e0746084196..74a9c469f47f 100644 --- a/reference/mongodb/mongodb/driver/readpreference/serialize.xml +++ b/reference/mongodb/mongodb/driver/readpreference/serialize.xml @@ -40,7 +40,7 @@ MongoDB\Driver\ReadPreference::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/readpreference/unserialize.xml b/reference/mongodb/mongodb/driver/readpreference/unserialize.xml index 78a6f78e45aa..18e0b3adc2dd 100644 --- a/reference/mongodb/mongodb/driver/readpreference/unserialize.xml +++ b/reference/mongodb/mongodb/driver/readpreference/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\Driver\ReadPreference::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/writeconcern/serialize.xml b/reference/mongodb/mongodb/driver/writeconcern/serialize.xml index 01739f932e99..3516ae259056 100644 --- a/reference/mongodb/mongodb/driver/writeconcern/serialize.xml +++ b/reference/mongodb/mongodb/driver/writeconcern/serialize.xml @@ -40,7 +40,7 @@ MongoDB\Driver\WriteConcern::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/mongodb/mongodb/driver/writeconcern/unserialize.xml b/reference/mongodb/mongodb/driver/writeconcern/unserialize.xml index efadc3167897..cc0ba7e06354 100644 --- a/reference/mongodb/mongodb/driver/writeconcern/unserialize.xml +++ b/reference/mongodb/mongodb/driver/writeconcern/unserialize.xml @@ -52,7 +52,7 @@ MongoDB\Driver\WriteConcern::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/mysqli/mysqli/poll.xml b/reference/mysqli/mysqli/poll.xml index 020a94b9b868..0c6eb4ceb553 100644 --- a/reference/mysqli/mysqli/poll.xml +++ b/reference/mysqli/mysqli/poll.xml @@ -31,7 +31,7 @@ Poll connections. &mysqli.available.mysqlnd; The method can be used as - static. + static. diff --git a/reference/pdo/constants.xml b/reference/pdo/constants.xml index 166e5f325715..cf3e5d9ab289 100644 --- a/reference/pdo/constants.xml +++ b/reference/pdo/constants.xml @@ -240,7 +240,7 @@ The magic - __set + __set method is called if the property doesn't exist in the requested class diff --git a/reference/pthreads/threaded/from.xml b/reference/pthreads/threaded/from.xml index 94e6f8bd6437..644e1d10b16e 100644 --- a/reference/pthreads/threaded/from.xml +++ b/reference/pthreads/threaded/from.xml @@ -11,7 +11,7 @@ This method has been removed in pthreads v3. With the introduction of - anonymous classes in PHP 7, + anonymous classes in PHP 7, these can now be used instead. diff --git a/reference/reflection/reflectionclass.xml b/reference/reflection/reflectionclass.xml index 14294a82fba1..9919c9c46700 100644 --- a/reference/reflection/reflectionclass.xml +++ b/reference/reflection/reflectionclass.xml @@ -100,7 +100,7 @@ ReflectionClass::IS_IMPLICIT_ABSTRACT - Indicates class that is + Indicates class that is abstract because it has some abstract methods. @@ -110,7 +110,7 @@ ReflectionClass::IS_EXPLICIT_ABSTRACT - Indicates class that is + Indicates class that is abstract because of its definition. @@ -120,7 +120,7 @@ ReflectionClass::IS_FINAL - Indicates final + Indicates final class. diff --git a/reference/reflection/reflectionclass/construct.xml b/reference/reflection/reflectionclass/construct.xml index 8389b8b7ca94..260b44c8cffe 100644 --- a/reference/reflection/reflectionclass/construct.xml +++ b/reference/reflection/reflectionclass/construct.xml @@ -134,7 +134,7 @@ Class [ class Exception ] { ReflectionObject::__construct - Constructors + Constructors diff --git a/reference/reflection/reflectionclass/implementsinterface.xml b/reference/reflection/reflectionclass/implementsinterface.xml index 3cbc9e292124..de47d12aeb76 100644 --- a/reference/reflection/reflectionclass/implementsinterface.xml +++ b/reference/reflection/reflectionclass/implementsinterface.xml @@ -57,7 +57,7 @@ ReflectionClass::isInterface ReflectionClass::isSubclassOf interface_exists - Object Interfaces + Object Interfaces diff --git a/reference/reflection/reflectionclass/isabstract.xml b/reference/reflection/reflectionclass/isabstract.xml index 1f20baff37eb..8043976caeff 100644 --- a/reference/reflection/reflectionclass/isabstract.xml +++ b/reference/reflection/reflectionclass/isabstract.xml @@ -65,7 +65,7 @@ bool(true) ReflectionClass::isInterface - Class Abstraction + Class Abstraction diff --git a/reference/reflection/reflectionclass/isfinal.xml b/reference/reflection/reflectionclass/isfinal.xml index f5aa683c54d1..17d29c4d74d5 100644 --- a/reference/reflection/reflectionclass/isfinal.xml +++ b/reference/reflection/reflectionclass/isfinal.xml @@ -66,7 +66,7 @@ bool(true) ReflectionClass::isAbstract - Final Keyword + Final Keyword diff --git a/reference/reflection/reflectionclass/isinstance.xml b/reference/reflection/reflectionclass/isinstance.xml index b6af1b3895c4..730af8dbfffa 100644 --- a/reference/reflection/reflectionclass/isinstance.xml +++ b/reference/reflection/reflectionclass/isinstance.xml @@ -86,7 +86,7 @@ Yes ReflectionClass::isInterface Type operators (instanceof) - Object Interfaces + Object Interfaces is_a diff --git a/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml b/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml index 7ed357ca16d6..ad69944e8a58 100644 --- a/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml +++ b/reference/reflection/reflectionclass/newinstancewithoutconstructor.xml @@ -46,7 +46,7 @@ 5.6.0 All internal classes can now be instantiated except for those declared - final. + final. @@ -61,7 +61,7 @@ A ReflectionException if the class is an internal class that cannot be instantiated without invoking the constructor. In PHP 5.6.0 onwards, this exception is limited only to internal classes that are - final. + final. diff --git a/reference/reflection/reflectionclassconstant/construct.xml b/reference/reflection/reflectionclassconstant/construct.xml index d00ff91b55ac..adf815364690 100644 --- a/reference/reflection/reflectionclassconstant/construct.xml +++ b/reference/reflection/reflectionclassconstant/construct.xml @@ -62,7 +62,7 @@ &reftitle.seealso; - Constructors + Constructors diff --git a/reference/reflection/reflectionextension/clone.xml b/reference/reflection/reflectionextension/clone.xml index a142e33a02bb..f488200da8ed 100644 --- a/reference/reflection/reflectionextension/clone.xml +++ b/reference/reflection/reflectionextension/clone.xml @@ -36,7 +36,7 @@ ReflectionExtension::__construct - Object cloning + Object cloning diff --git a/reference/reflection/reflectionextension/construct.xml b/reference/reflection/reflectionextension/construct.xml index da4eef85c6be..9d5872da9038 100644 --- a/reference/reflection/reflectionextension/construct.xml +++ b/reference/reflection/reflectionextension/construct.xml @@ -70,7 +70,7 @@ Extension: Reflection (version: $Revision$) ReflectionExtension::info - Constructors + Constructors diff --git a/reference/reflection/reflectionfunction/construct.xml b/reference/reflection/reflectionfunction/construct.xml index ef0434543f52..f8c87a6a71ab 100644 --- a/reference/reflection/reflectionfunction/construct.xml +++ b/reference/reflection/reflectionfunction/construct.xml @@ -150,7 +150,7 @@ dumpReflectionFunction(new ReflectionFunction($counter2)); ReflectionMethod::__construct - Constructors + Constructors diff --git a/reference/reflection/reflectionfunctionabstract/clone.xml b/reference/reflection/reflectionfunctionabstract/clone.xml index f9dc6d53489e..672a43d9b108 100644 --- a/reference/reflection/reflectionfunctionabstract/clone.xml +++ b/reference/reflection/reflectionfunctionabstract/clone.xml @@ -37,7 +37,7 @@ &reftitle.seealso; - Object cloning + Object cloning diff --git a/reference/reflection/reflectionmethod/construct.xml b/reference/reflection/reflectionmethod/construct.xml index 3a807e5a77df..679d8633469d 100644 --- a/reference/reflection/reflectionmethod/construct.xml +++ b/reference/reflection/reflectionmethod/construct.xml @@ -163,7 +163,7 @@ var_dump($method->invoke(NULL)); ReflectionMethod::export - Constructors + Constructors diff --git a/reference/reflection/reflectionobject/construct.xml b/reference/reflection/reflectionobject/construct.xml index 79d9671bda74..44e935c6f235 100644 --- a/reference/reflection/reflectionobject/construct.xml +++ b/reference/reflection/reflectionobject/construct.xml @@ -49,7 +49,7 @@ ReflectionObject::export - Constructors + Constructors diff --git a/reference/reflection/reflectionparameter/clone.xml b/reference/reflection/reflectionparameter/clone.xml index 7eb3dc75d668..8fb2a1146a91 100644 --- a/reference/reflection/reflectionparameter/clone.xml +++ b/reference/reflection/reflectionparameter/clone.xml @@ -38,7 +38,7 @@ ReflectionParameter::toString - Object cloning + Object cloning diff --git a/reference/reflection/reflectionparameter/construct.xml b/reference/reflection/reflectionparameter/construct.xml index 6e3f0e189abb..686038e31626 100644 --- a/reference/reflection/reflectionparameter/construct.xml +++ b/reference/reflection/reflectionparameter/construct.xml @@ -130,7 +130,7 @@ Function [ function foo ] { ReflectionFunctionAbstract::getParameters ReflectionFunction::__construct ReflectionMethod::__construct - Constructors + Constructors diff --git a/reference/reflection/reflectionproperty.xml b/reference/reflection/reflectionproperty.xml index 3a098fb20f10..4195e8ca12db 100644 --- a/reference/reflection/reflectionproperty.xml +++ b/reference/reflection/reflectionproperty.xml @@ -119,7 +119,7 @@ ReflectionProperty::IS_STATIC - Indicates static + Indicates static properties. @@ -129,7 +129,7 @@ ReflectionProperty::IS_PUBLIC - Indicates public + Indicates public properties. @@ -139,7 +139,7 @@ ReflectionProperty::IS_PROTECTED - Indicates protected + Indicates protected properties. @@ -149,7 +149,7 @@ ReflectionProperty::IS_PRIVATE - Indicates private + Indicates private properties. diff --git a/reference/reflection/reflectionproperty/clone.xml b/reference/reflection/reflectionproperty/clone.xml index bc4d69c37e90..cf45f8afad0c 100644 --- a/reference/reflection/reflectionproperty/clone.xml +++ b/reference/reflection/reflectionproperty/clone.xml @@ -38,7 +38,7 @@ ReflectionProperty::export - Object cloning + Object cloning diff --git a/reference/reflection/reflectionproperty/construct.xml b/reference/reflection/reflectionproperty/construct.xml index a57c4ca71799..b00856cb9c5b 100644 --- a/reference/reflection/reflectionproperty/construct.xml +++ b/reference/reflection/reflectionproperty/construct.xml @@ -164,7 +164,7 @@ int(3) ReflectionProperty::getName - Constructors + Constructors diff --git a/reference/sdo/limitations.xml b/reference/sdo/limitations.xml index 130aac4c3afc..a4150a8b28ac 100644 --- a/reference/sdo/limitations.xml +++ b/reference/sdo/limitations.xml @@ -45,7 +45,7 @@ However equivalent function is provided in a more natural way for PHP. For example the function of CopyHelper::copy() is provided by applying the PHP - clone keyword to a data object. + clone keyword to a data object. diff --git a/reference/spl/arrayobject/serialize.xml b/reference/spl/arrayobject/serialize.xml index de34231f1016..36c63428ae9e 100644 --- a/reference/spl/arrayobject/serialize.xml +++ b/reference/spl/arrayobject/serialize.xml @@ -68,7 +68,7 @@ string(21) "x:i:0;a:0:{};m:a:0:{}" ArrayObject::unserialize serialize - Serializing Objects + Serializing Objects diff --git a/reference/spl/arrayobject/unserialize.xml b/reference/spl/arrayobject/unserialize.xml index 79ef12e6103a..c804e83e595f 100644 --- a/reference/spl/arrayobject/unserialize.xml +++ b/reference/spl/arrayobject/unserialize.xml @@ -50,7 +50,7 @@ ArrayIterator::serialize unserialize - Serializing Objects + Serializing Objects diff --git a/reference/var/functions/serialize.xml b/reference/var/functions/serialize.xml index 87ed365d8064..8c894e014e28 100644 --- a/reference/var/functions/serialize.xml +++ b/reference/var/functions/serialize.xml @@ -137,7 +137,7 @@ if (!odbc_execute($stmt, $sqldata)) { unserialize var_export json_encode - Serializing Objects + Serializing Objects __sleep() __wakeup() __serialize() diff --git a/reference/var/functions/unserialize.xml b/reference/var/functions/unserialize.xml index e72ed24e47eb..07fbebd2795a 100644 --- a/reference/var/functions/unserialize.xml +++ b/reference/var/functions/unserialize.xml @@ -242,7 +242,7 @@ function mycallback($classname) json_decode hash_hmac serialize - Autoloading Classes + Autoloading Classes unserialize_callback_func __wakeup() __serialize() diff --git a/reference/var/functions/var-dump.xml b/reference/var/functions/var-dump.xml index 9098a5ae17e7..bbae6640bed5 100644 --- a/reference/var/functions/var-dump.xml +++ b/reference/var/functions/var-dump.xml @@ -22,7 +22,7 @@ All public, private and protected properties of objects will be returned in the output unless the object implements a - __debugInfo() method + __debugInfo() method (implemented in PHP 5.6.0). &tip.ob-capture; @@ -121,7 +121,7 @@ bool(true) print_r debug_zval_dump var_export - __debugInfo() + __debugInfo() diff --git a/reference/var/ini.xml b/reference/var/ini.xml index 08bd9f91465e..a73596c0f3c8 100644 --- a/reference/var/ini.xml +++ b/reference/var/ini.xml @@ -45,7 +45,7 @@ define the missing class. - See also unserialize and Autoloading Objects. + See also unserialize and Autoloading Objects.