Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change instances of oop5 to oop #255

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion appendices/ini.core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@
<para>
Enable compatibility mode with Zend Engine 1 (PHP 4). It affects
the cloning, casting (objects with no properties cast to &false; or 0), and <link
linkend="language.oop5.object-comparison">comparing of objects</link>.
linkend="language.oop.object-comparison">comparing of objects</link>.
In this mode, objects are passed by value instead of reference by
default.
</para>
Expand Down
4 changes: 2 additions & 2 deletions appendices/migration5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<simpara>
In some cases classes must be declared before use. It only happens if
some of the new features of PHP 5 (such as <link
linkend="language.oop5.interfaces">interfaces</link>) are used.
linkend="language.oop.interfaces">interfaces</link>) are used.
Otherwise the behaviour is the old.
</simpara>
</listitem>
Expand Down Expand Up @@ -916,7 +916,7 @@ Action application/x-httpd-php "/php/php-cgi.exe"
</para>
<para>
The new Object Model is documented at the <link
linkend="language.oop5">Language Reference</link>.
linkend="language.oop">Language Reference</link>.
</para>
<para>
In PHP 5, function with the name of a class is called as a constructor
Expand Down
2 changes: 1 addition & 1 deletion appendices/migration52.xml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ include "php://input";
</para>
<para>
<example>
<title><link linkend="language.oop5">Object Oriented Code</link> in PHP Core</title>
<title><link linkend="language.oop">Object Oriented Code</link> in PHP Core</title>
<programlisting role="php">
<![CDATA[
<?php
Expand Down
4 changes: 2 additions & 2 deletions appendices/migration53.xml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
</listitem>
<listitem>
<simpara>
Support for <link linkend="language.oop5.late-static-bindings">Late Static
Support for <link linkend="language.oop.late-static-bindings">Late Static
Bindings</link> has been added.
</simpara>
</listitem>
Expand Down Expand Up @@ -736,7 +736,7 @@ try {
<listitem>
<simpara>
Assigning the return value of
<link linkend="language.oop5.basic.new">new</link> by reference is now
<link linkend="language.oop.basic.new">new</link> by reference is now
deprecated.
</simpara>
</listitem>
Expand Down
8 changes: 4 additions & 4 deletions appendices/migration54.xml
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
<itemizedlist>
<listitem>
<simpara>
<link linkend="language.oop5.traits">trait</link>
<link linkend="language.oop.traits">trait</link>
</simpara>
</listitem>
<listitem>
Expand All @@ -223,7 +223,7 @@
</listitem>
<listitem>
<simpara>
<link linkend="language.oop5.traits">insteadof</link>
<link linkend="language.oop.traits">insteadof</link>
</simpara>
</listitem>
</itemizedlist>
Expand Down Expand Up @@ -267,7 +267,7 @@
<itemizedlist>
<listitem>
<simpara>
Support for <link linkend="language.oop5.traits">traits</link> has been added.
Support for <link linkend="language.oop.traits">traits</link> has been added.
</simpara>
</listitem>
<listitem>
Expand Down Expand Up @@ -1491,7 +1491,7 @@
</listitem>
<listitem>
<simpara>
It's now possible to enforce the class' <link linkend="language.oop5.decon">__construct</link> arguments in an abstract
It's now possible to enforce the class' <link linkend="language.oop.decon">__construct</link> arguments in an abstract
constructor in the base class.
</simpara>
</listitem>
Expand Down
8 changes: 4 additions & 4 deletions appendices/migration55.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ if (version_compare(PHP_VERSION, '5.5.0-dev', '>=')) {

<para>
Prior to PHP 5.5, cases existed where the
<link linkend="language.oop5.paamayim-nekudotayim">self</link>,
<link linkend="language.oop5.paamayim-nekudotayim">parent</link>, and
<link linkend="language.oop5.late-static-bindings">static</link>
<link linkend="language.oop.paamayim-nekudotayim">self</link>,
<link linkend="language.oop.paamayim-nekudotayim">parent</link>, and
<link linkend="language.oop.late-static-bindings">static</link>
keywords were treated in a case sensitive fashion. These have now been
resolved, and these keywords are always handled case insensitively:
<literal>SELF::CONSTANT</literal> is now treated identically to
Expand Down Expand Up @@ -413,7 +413,7 @@ String dereferencing: P
</sect2>

<sect2 xml:id="migration55.new-features.class-name">
<title>Class name resolution via <link linkend="language.oop5.basic.class.class">::class</link></title>
<title>Class name resolution via <link linkend="language.oop.basic.class.class">::class</link></title>

<para>
It is possible to use <literal>ClassName::class</literal> to get a fully
Expand Down
2 changes: 1 addition & 1 deletion appendices/migration56/new-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ bool(false)
<title><literal>__debugInfo()</literal></title>

<para>
The <link linkend="language.oop5.magic.debuginfo">__debugInfo()</link>
The <link linkend="language.oop.magic.debuginfo">__debugInfo()</link>
magic method has been added to allow objects to change the properties and
values that are shown when the object is output using
<function>var_dump</function>.
Expand Down
2 changes: 1 addition & 1 deletion appendices/migration70/deprecated.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Deprecated: Methods with the same name as their class will not be constructors i
<title>Static calls to non-static methods</title>

<para>
<link linkend="language.oop5.static">Static</link> calls to methods that
<link linkend="language.oop.static">Static</link> calls to methods that
are not declared <command>static</command> are deprecated, and may be
removed in the future.
</para>
Expand Down
2 changes: 1 addition & 1 deletion appendices/migration70/new-features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ object(class@anonymous)#2 (0) {

<para>
Full documentation can be found in the
<link linkend="language.oop5.anonymous">anonymous class reference</link>.
<link linkend="language.oop.anonymous">anonymous class reference</link>.
</para>
</sect2>

Expand Down
36 changes: 18 additions & 18 deletions appendices/reserved.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<function>__halt_compiler</function>
</entry>
<entry>
<link linkend="language.oop5.abstract">abstract</link>
<link linkend="language.oop.abstract">abstract</link>
</entry>
<entry>
<link linkend="language.operators.logical">and</link>
Expand All @@ -61,15 +61,15 @@
<link linkend="language.exceptions">catch</link>
</entry>
<entry>
<link linkend="language.oop5.basic.class">class</link>
<link linkend="language.oop.basic.class">class</link>
</entry>
</row>
<row>
<entry>
<link linkend="language.oop5.cloning">clone</link>
<link linkend="language.oop.cloning">clone</link>
</entry>
<entry>
<link linkend="language.oop5.constants">const</link>
<link linkend="language.oop.constants">const</link>
</entry>
<entry>
<link linkend="control-structures.continue">continue</link>
Expand Down Expand Up @@ -129,12 +129,12 @@
<function>exit</function>
</entry>
<entry>
<link linkend="language.oop5.basic.extends">extends</link>
<link linkend="language.oop.basic.extends">extends</link>
</entry>
</row>
<row>
<entry>
<link linkend="language.oop5.final">final</link>
<link linkend="language.oop.final">final</link>
</entry>
<entry>
<link linkend="language.exceptions">finally</link> (as of PHP 5.5)
Expand Down Expand Up @@ -163,7 +163,7 @@
<link linkend="control-structures.if">if</link>
</entry>
<entry>
<link linkend="language.oop5.interfaces">implements</link>
<link linkend="language.oop.interfaces">implements</link>
</entry>
</row>
<row>
Expand All @@ -177,10 +177,10 @@
<link linkend="language.operators.type">instanceof</link>
</entry>
<entry>
<link linkend="language.oop5.traits.conflict">insteadof</link> (as of PHP 5.4)
<link linkend="language.oop.traits.conflict">insteadof</link> (as of PHP 5.4)
</entry>
<entry>
<link linkend="language.oop5.interfaces">interface</link>
<link linkend="language.oop.interfaces">interface</link>
</entry>
</row>
<row>
Expand All @@ -194,7 +194,7 @@
<link linkend="language.namespaces">namespace</link> (as of PHP 5.3)
</entry>
<entry>
<link linkend="language.oop5.basic.new">new</link>
<link linkend="language.oop.basic.new">new</link>
</entry>
<entry>
<link linkend="language.operators.logical">or</link>
Expand All @@ -205,13 +205,13 @@
<function>print</function>
</entry>
<entry>
<link linkend="language.oop5.visibility">private</link>
<link linkend="language.oop.visibility">private</link>
</entry>
<entry>
<link linkend="language.oop5.visibility">protected</link>
<link linkend="language.oop.visibility">protected</link>
</entry>
<entry>
<link linkend="language.oop5.visibility">public</link>
<link linkend="language.oop.visibility">public</link>
</entry>
<entry>
<function>require</function>
Expand All @@ -236,7 +236,7 @@
</row>
<row>
<entry>
<link linkend="language.oop5.traits">trait</link> (as of PHP 5.4)
<link linkend="language.oop.traits">trait</link> (as of PHP 5.4)
</entry>
<entry>
<link linkend="language.exceptions">try</link>
Expand All @@ -248,7 +248,7 @@
<link linkend="language.namespaces">use</link>
</entry>
<entry>
<link linkend="language.oop5.properties">var</link>
<link linkend="language.oop.properties">var</link>
</entry>
</row>
<row>
Expand Down Expand Up @@ -496,7 +496,7 @@
<term><classname>self</classname></term>
<listitem>
<simpara>
<link linkend="language.oop5.paamayim-nekudotayim">Current
<link linkend="language.oop.paamayim-nekudotayim">Current
class</link>.
</simpara>
</listitem>
Expand All @@ -505,7 +505,7 @@
<term><classname>static</classname></term>
<listitem>
<simpara>
<link linkend="language.oop5.late-static-bindings">Current class in
<link linkend="language.oop.late-static-bindings">Current class in
runtime</link>.
</simpara>
</listitem>
Expand All @@ -514,7 +514,7 @@
<term><classname>parent</classname></term>
<listitem>
<simpara>
<link linkend="language.oop5.paamayim-nekudotayim">Parent
<link linkend="language.oop.paamayim-nekudotayim">Parent
class</link>.
</simpara>
</listitem>
Expand Down