aidan Wed Oct 13 07:19:16 2004 EDT
Modified files:
/phpdoc/en/language/oop5 basic.xml visibility.xml
Log:
Fixed mistakes, thanks pierre/haitiministries.com
http://cvs.php.net/diff.php/phpdoc/en/language/oop5/basic.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/language/oop5/basic.xml
diff -u phpdoc/en/language/oop5/basic.xml:1.5 phpdoc/en/language/oop5/basic.xml:1.6
--- phpdoc/en/language/oop5/basic.xml:1.5 Sat Oct 2 05:40:50 2004
+++ phpdoc/en/language/oop5/basic.xml Wed Oct 13 07:19:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<sect1 id="language.oop5.basic">
<title>The Basics</title>
@@ -8,12 +8,12 @@
<title>class</title>
<para>
Every class definition begins with the keyword class, followed by a class
- name, which can be any name that isn't a <link linkend="reserved">
- reserved</link> word in PHP. Followed by a pair of curly braces, of
+ name, which can be any name that isn't a <link linkend="reserved">reserved</link>
+ word in PHP. Followed by a pair of curly braces, of
which contains the definition of the classes members and methods. Within
each method, except for <link linkend="language.oop5.static">static</link>
methods, a pseudo variable <varname>$this</varname> is available.
- <varname>$this</varname> is a reference to the same instance that
+ <varname>$this</varname> is a reference to the same instance that
called the method.
</para>
<example>
@@ -42,9 +42,9 @@
<para>
To create an instance of an object, a new object must be created and
assigned to a variable. An object will always be assigned when
- creating a new object unless the object has a <link
- linkend="language.oop5.decon">constructor</link> defined that throws an <link
- linkend="language.oop5.exceptions">exception</link> on error.
+ creating a new object unless the object has a
+ <link linkend="language.oop5.decon">constructor</link> defined that throws an
+ <link linkend="language.oop5.exceptions">exception</link> on error.
</para>
<example>
<title>Creating an instance</title>
@@ -60,8 +60,8 @@
When assigning an already created instance of an object to a new variable, the
new variable
will access the same instance as the object that was assigned. This
behaviour is the same when passing instances to a function. A new instance
- of an already created object can be made by <link
- linkend="language.oop5.cloning">cloning</link> it.
+ of an already created object can be made by
+ <link linkend="language.oop5.cloning">cloning</link> it.
</para>
<example>
<title>Object Assignment</title>
@@ -104,11 +104,10 @@
</para>
<para>
The inherited methods and members can be overloaded, unless the parent
- class has defined a method as <link
- linkend="language.oop5.final">final</link>, by redeclaring them
- within the same name defined in the parent class. It is possible to access the
overloaded
- method or members by referencing them with <link
- linkend="language.oop5.paamayim-nekudotayim">parent::</link>
+ class has defined a method as <link linkend="language.oop5.final">final</link>,
+ by redeclaring them within the same name defined in the parent class.
+ It is possible to access the overloaded method or members by
+ referencing them with <link
linkend="language.oop5.paamayim-nekudotayim">parent::</link>
</para>
<example>
<title>Simple Class Inherintance</title>
http://cvs.php.net/diff.php/phpdoc/en/language/oop5/visibility.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/language/oop5/visibility.xml
diff -u phpdoc/en/language/oop5/visibility.xml:1.6
phpdoc/en/language/oop5/visibility.xml:1.7
--- phpdoc/en/language/oop5/visibility.xml:1.6 Mon Oct 11 11:09:41 2004
+++ phpdoc/en/language/oop5/visibility.xml Wed Oct 13 07:19:09 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<sect1 id="language.oop5.visibility">
<title>Visibility</title>
<para>
@@ -73,8 +73,9 @@
</para>
<note>
<simpara>
- The use PHP 4 use of declaring a variable with the keyword 'var' is
- no longer valid for PHP 5 objects. For compatibility a variable declared
+ The PHP 4 method of declaring a variable with the
+ <emphasis>var</emphasis> keyword is no longer valid
+ for PHP 5 objects. For compatibility a variable declared
in php will be assumed with public visibility, and a
<constant>E_STRICT</constant> warning will be issued.
</simpara>
