didou Thu Jan 15 07:42:05 2004 EDT
Modified files:
/phpdoc/en/reference/classobj reference.xml
/phpdoc/en/reference/classobj/functions call-user-method.xml
get-class-methods.xml
get-class.xml
get-object-vars.xml
get-parent-class.xml
Log:
CS : Function declarations follow the 'one true brace' convention
Index: phpdoc/en/reference/classobj/reference.xml
diff -u phpdoc/en/reference/classobj/reference.xml:1.11
phpdoc/en/reference/classobj/reference.xml:1.12
--- phpdoc/en/reference/classobj/reference.xml:1.11 Thu Dec 18 12:43:31 2003
+++ phpdoc/en/reference/classobj/reference.xml Thu Jan 15 07:42:04 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<reference id="ref.classobj">
<title>Class/Object Functions</title>
<titleabbrev>Classes/Objects</titleabbrev>
@@ -64,16 +64,19 @@
var $edible;
var $color;
- function Vegetable($edible, $color="green") {
+ function Vegetable($edible, $color="green")
+ {
$this->edible = $edible;
$this->color = $color;
}
- function is_edible() {
+ function is_edible()
+ {
return $this->edible;
}
- function what_color() {
+ function what_color()
+ {
return $this->color;
}
@@ -84,15 +87,18 @@
var $cooked = false;
- function Spinach() {
+ function Spinach()
+ {
$this->Vegetable(true, "green");
}
- function cook_it() {
+ function cook_it()
+ {
$this->cooked = true;
}
- function is_cooked() {
+ function is_cooked()
+ {
return $this->cooked;
}
@@ -121,19 +127,22 @@
// utility functions
-function print_vars($obj) {
+function print_vars($obj)
+{
$arr = get_object_vars($obj);
while (list($prop, $val) = each($arr))
echo "\t$prop = $val\n";
}
-function print_methods($obj) {
+function print_methods($obj)
+{
$arr = get_class_methods(get_class($obj));
foreach ($arr as $method)
echo "\tfunction $method()\n";
}
-function class_parentage($obj, $class) {
+function class_parentage($obj, $class)
+{
if (is_subclass_of($GLOBALS[$obj], $class)) {
echo "Object $obj belongs to class " . get_class($$obj);
echo " a subclass of $class\n";
Index: phpdoc/en/reference/classobj/functions/call-user-method.xml
diff -u phpdoc/en/reference/classobj/functions/call-user-method.xml:1.7
phpdoc/en/reference/classobj/functions/call-user-method.xml:1.8
--- phpdoc/en/reference/classobj/functions/call-user-method.xml:1.7 Thu Dec 18
18:58:38 2003
+++ phpdoc/en/reference/classobj/functions/call-user-method.xml Thu Jan 15 07:42:05
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/classobj.xml, last change in rev 1.4 -->
<refentry id="function.call-user-method">
<refnamediv>
@@ -40,12 +40,14 @@
var $NAME;
var $TLD;
- function Country($name, $tld) {
+ function Country($name, $tld)
+ {
$this->NAME = $name;
$this->TLD = $tld;
}
- function print_info($prestr = "") {
+ function print_info($prestr = "")
+ {
echo $prestr . "Country: " . $this->NAME . "\n";
echo $prestr . "Top Level Domain: " . $this->TLD . "\n";
}
Index: phpdoc/en/reference/classobj/functions/get-class-methods.xml
diff -u phpdoc/en/reference/classobj/functions/get-class-methods.xml:1.6
phpdoc/en/reference/classobj/functions/get-class-methods.xml:1.7
--- phpdoc/en/reference/classobj/functions/get-class-methods.xml:1.6 Mon Dec 15
11:47:48 2003
+++ phpdoc/en/reference/classobj/functions/get-class-methods.xml Thu Jan 15
07:42:05 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/classobj.xml, last change in rev 1.2 -->
<refentry id="function.get-class-methods">
<refnamediv>
@@ -40,17 +40,20 @@
class myclass {
// constructor
- function myclass() {
+ function myclass()
+ {
return(true);
}
// method 1
- function myfunc1() {
+ function myfunc1()
+ {
return(true);
}
// method 2
- function myfunc2() {
+ function myfunc2()
+ {
return(true);
}
}
Index: phpdoc/en/reference/classobj/functions/get-class.xml
diff -u phpdoc/en/reference/classobj/functions/get-class.xml:1.4
phpdoc/en/reference/classobj/functions/get-class.xml:1.5
--- phpdoc/en/reference/classobj/functions/get-class.xml:1.4 Wed Jul 9 06:19:31
2003
+++ phpdoc/en/reference/classobj/functions/get-class.xml Thu Jan 15 07:42:05
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/classobj.xml, last change in rev 1.4 -->
<refentry id="function.get-class">
<refnamediv>
@@ -32,11 +32,13 @@
<?php
class foo {
- function foo() {
+ function foo()
+ {
// implements some logic
}
- function name() {
+ function name()
+ {
echo "My name is " , get_class($this) , "\n";
}
}
Index: phpdoc/en/reference/classobj/functions/get-object-vars.xml
diff -u phpdoc/en/reference/classobj/functions/get-object-vars.xml:1.5
phpdoc/en/reference/classobj/functions/get-object-vars.xml:1.6
--- phpdoc/en/reference/classobj/functions/get-object-vars.xml:1.5 Thu Jan 8
18:36:57 2004
+++ phpdoc/en/reference/classobj/functions/get-object-vars.xml Thu Jan 15 07:42:05
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/classobj.xml, last change in rev 1.1 -->
<refentry id="function.get-object-vars">
<refnamediv>
@@ -35,16 +35,19 @@
var $x, $y;
var $label;
- function Point2D($x, $y) {
+ function Point2D($x, $y)
+ {
$this->x = $x;
$this->y = $y;
}
- function setLabel($label) {
+ function setLabel($label)
+ {
$this->label = $label;
}
- function getPoint() {
+ function getPoint()
+ {
return array("x" => $this->x,
"y" => $this->y,
"label" => $this->label);
Index: phpdoc/en/reference/classobj/functions/get-parent-class.xml
diff -u phpdoc/en/reference/classobj/functions/get-parent-class.xml:1.4
phpdoc/en/reference/classobj/functions/get-parent-class.xml:1.5
--- phpdoc/en/reference/classobj/functions/get-parent-class.xml:1.4 Wed Jul 9
06:19:31 2003
+++ phpdoc/en/reference/classobj/functions/get-parent-class.xml Thu Jan 15 07:42:05
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/classobj.xml, last change in rev 1.4 -->
<refentry id="function.get-parent-class">
<refnamediv>
@@ -30,19 +30,22 @@
<?php
class dad {
- function dad() {
+ function dad()
+ {
// implements some logic
}
}
class child extends dad {
- function child() {
+ function child()
+ {
echo "I'm " , get_parent_class($this) , "'s son\n";
}
}
class child2 extends dad {
- function child2() {
+ function child2()
+ {
echo "I'm " , get_parent_class('child2') , "'s son too\n";
}
}
