diff --git a/manual/codes/Coding standards - Coding Style - Arrays.php b/manual/codes/Coding standards - Coding Style - Arrays.php
new file mode 100644
index 000000000..28cf67d53
--- /dev/null
+++ b/manual/codes/Coding standards - Coding Style - Arrays.php
@@ -0,0 +1,12 @@
+ 'firstValue',
+ 'second' => 'secondValue');
+
diff --git a/manual/codes/Coding standards - Coding Style - Classes.php b/manual/codes/Coding standards - Coding Style - Classes.php
new file mode 100644
index 000000000..587d8f9c0
--- /dev/null
+++ b/manual/codes/Coding standards - Coding Style - Classes.php
@@ -0,0 +1,8 @@
+
diff --git a/manual/codes/Coding standards - Naming Conventions - Filenames.php b/manual/codes/Coding standards - Naming Conventions - Filenames.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Coding standards - Naming Conventions - Functions and methods.php b/manual/codes/Coding standards - Naming Conventions - Functions and methods.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Coding standards - Naming Conventions - Interfaces.php b/manual/codes/Coding standards - Naming Conventions - Interfaces.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Coding standards - Naming Conventions - Record columns.php b/manual/codes/Coding standards - Naming Conventions - Record columns.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Coding standards - Naming Conventions - Variables.php b/manual/codes/Coding standards - Naming Conventions - Variables.php
new file mode 100644
index 000000000..d3f5a12fa
--- /dev/null
+++ b/manual/codes/Coding standards - Naming Conventions - Variables.php
@@ -0,0 +1 @@
+
diff --git a/manual/codes/Coding standards - Overview - Goals.php b/manual/codes/Coding standards - Overview - Goals.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Coding standards - Overview - Scope.php b/manual/codes/Coding standards - Overview - Scope.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/docs/Advanced components - Eventlisteners - AccessorInvoker.php b/manual/docs/Advanced components - Eventlisteners - AccessorInvoker.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/docs/Basic Components - Record - Checking Existence.php b/manual/docs/Basic Components - Record - Checking Existence.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/docs/Coding standards - Coding Style - Arrays.php b/manual/docs/Coding standards - Coding Style - Arrays.php
new file mode 100644
index 000000000..4eafdf10b
--- /dev/null
+++ b/manual/docs/Coding standards - Coding Style - Arrays.php
@@ -0,0 +1,15 @@
+
+- Negative numbers are not permitted as indices.
+
+
+- An indexed array may be started with any non-negative number, however this is discouraged and it is recommended that all arrays have a base index of 0.
+
+
+- When declaring indexed arrays with the array construct, a trailing space must be added after each comma delimiter to improve readability.
+
+
+- It is also permitted to declare multiline indexed arrays using the "array" construct. In this case, each successive line must be padded with spaces.
+
+
+- When declaring associative arrays with the array construct, it is encouraged to break the statement into multiple lines. In this case, each successive line must be padded with whitespace such that both the keys and the values are aligned:
+
diff --git a/manual/docs/Coding standards - Coding Style - Classes.php b/manual/docs/Coding standards - Coding Style - Classes.php
new file mode 100644
index 000000000..6951fc07e
--- /dev/null
+++ b/manual/docs/Coding standards - Coding Style - Classes.php
@@ -0,0 +1,21 @@
+
+- Classes must be named by following the naming conventions.
+
+
+- The brace is always written right after the class name (or interface declaration).
+
+
+- Every class must have a documentation block that conforms to the PHPDocumentor standard.
+
+
+- Any code within a class must be indented four spaces.
+
+
+- Only one class is permitted per PHP file.
+
+
+- Placing additional code in a class file is NOT permitted.
+
+This is an example of an acceptable class declaration:
+
+
diff --git a/manual/docs/Coding standards - Coding Style - Control statements.php b/manual/docs/Coding standards - Coding Style - Control statements.php
new file mode 100644
index 000000000..164cea7b9
--- /dev/null
+++ b/manual/docs/Coding standards - Coding Style - Control statements.php
@@ -0,0 +1,75 @@
+
+
+- Control statements based on the if and elseif constructs must have a single space before the opening parenthesis of the conditional, and a single space after the closing parenthesis.
+
+
+- Within the conditional statements between the parentheses, operators must be separated by spaces for readability. Inner parentheses are encouraged to improve logical grouping of larger conditionals.
+
+
+- The opening brace is written on the same line as the conditional statement. The closing brace is always written on its own line. Any content within the braces must be indented four spaces.
+
+
+
+- For "if" statements that include "elseif" or "else", the formatting must be as in these examples:
+
+
+
+
+- PHP allows for these statements to be written without braces in some circumstances, the following format for if statements is also allowed:
+
+
+
+- Control statements written with the "switch" construct must have a single space before the opening parenthesis of the conditional statement, and also a single space after the closing parenthesis.
+
+
+- All content within the "switch" statement must be indented four spaces. Content under each "case" statement must be indented an additional four spaces but the breaks must be at the same indentation level as the "case" statements.
+
+");
+?>
+
+- The construct default may never be omitted from a switch statement.
+
diff --git a/manual/docs/Coding standards - Coding Style - Functions and methods.php b/manual/docs/Coding standards - Coding Style - Functions and methods.php
new file mode 100644
index 000000000..32aabcb2e
--- /dev/null
+++ b/manual/docs/Coding standards - Coding Style - Functions and methods.php
@@ -0,0 +1,99 @@
+
+
+- Methods must be named by following the naming conventions.
+
+
+- Methods must always declare their visibility by using one of the private, protected, or public constructs.
+
+
+- Like classes, the brace is always written right after the method name. There is no space between the function name and the opening parenthesis for the arguments.
+
+
+- Functions in the global scope are strongly discouraged.
+
+
+- This is an example of an acceptable function declaration in a class:
+
+
+
+
+- Passing by-reference is permitted in the function declaration only:
+
+
+
+- Call-time pass by-reference is prohibited.
+
+
+- The return value must not be enclosed in parentheses. This can hinder readability and can also break code if a method is later changed to return by reference.
+
+bar);
+ }
+ /**
+ * RIGHT
+ */
+ public function bar() {
+ return \$this->bar;
+ }
+}");
+?>
+
+- Function arguments are separated by a single trailing space after the comma delimiter. This is an example of an acceptable function call for a function that takes three arguments:
+
+");
+?>
+
+- Call-time pass by-reference is prohibited. See the function declarations section for the proper way to pass function arguments by-reference.
+
+
+- For functions whose arguments permitted arrays, the function call may include the "array" construct and can be split into multiple lines to improve readability. In these cases, the standards for writing arrays still apply:
+
+");
+?>
+
diff --git a/manual/docs/Coding standards - Coding Style - Inline documentation.php b/manual/docs/Coding standards - Coding Style - Inline documentation.php
new file mode 100644
index 000000000..ee680961f
--- /dev/null
+++ b/manual/docs/Coding standards - Coding Style - Inline documentation.php
@@ -0,0 +1,35 @@
+Documentation Format
+
+- All documentation blocks ("docblocks") must be compatible with the phpDocumentor format. Describing the phpDocumentor format is beyond the scope of this document. For more information, visit: http://phpdoc.org/
+
+
+Methods:
+
+- Every method, must have a docblock that contains at a minimum:
+
+
+
+- A description of the function
+
+
+
+
+
+- All of the possible return values
+
+
+
+
+- It is not necessary to use the "@access" tag because the access level is already known from the "public", "private", or "protected" construct used to declare the function.
+
+
+
+- If a function/method may throw an exception, use @throws:
+
+
+
+
+- @throws exceptionclass [description]
+
diff --git a/manual/docs/Coding standards - Coding Style - PHP code demarcation.php b/manual/docs/Coding standards - Coding Style - PHP code demarcation.php
new file mode 100644
index 000000000..673505441
--- /dev/null
+++ b/manual/docs/Coding standards - Coding Style - PHP code demarcation.php
@@ -0,0 +1,4 @@
+PHP code must always be delimited by the full-form, standard PHP tags ()
+
+Short tags are never allowed. For files containing only PHP code, the closing tag must always be omitted
+
diff --git a/manual/docs/Coding standards - Coding Style - Strings.php b/manual/docs/Coding standards - Coding Style - Strings.php
new file mode 100644
index 000000000..bb016d70d
--- /dev/null
+++ b/manual/docs/Coding standards - Coding Style - Strings.php
@@ -0,0 +1,18 @@
+
+- When a string is literal (contains no variable substitutions), the apostrophe or "single quote" must always used to demarcate the string:
+
+
+- When a literal string itself contains apostrophes, it is permitted to demarcate the string with quotation marks or "double quotes". This is especially encouraged for SQL statements:
+
+
+- Variable substitution is permitted using the following form:
+
+
+
+- Strings may be concatenated using the "." operator. A space must always be added before and after the "." operator to improve readability:
+
+
+
+- When concatenating strings with the "." operator, it is permitted to break the statement into multiple lines to improve readability. In these cases, each successive line should be padded with whitespace such that the "."; operator is aligned under the "=" operator:
+
+
diff --git a/manual/docs/Coding standards - Naming Conventions - Classes.php b/manual/docs/Coding standards - Naming Conventions - Classes.php
new file mode 100644
index 000000000..bc5a24b01
--- /dev/null
+++ b/manual/docs/Coding standards - Naming Conventions - Classes.php
@@ -0,0 +1,13 @@
+
+- The Doctrine ORM Framework uses the same class naming convention as PEAR and Zend framework, where the names of the classes directly
+map to the directories in which they are stored. The root level directory of the Doctrine Framework is the "Doctrine/" directory,
+under which all classes are stored hierarchially.
+
+
+- Class names may only contain alphanumeric characters. Numbers are permitted in class names but are discouraged.
+Underscores are only permitted in place of the path separator, eg. the filename "Doctrine/Table/Exception.php" must map to the class name "Doctrine_Table_Exception".
+
+
+- If a class name is comprised of more than one word, the first letter of each new word must be capitalized. Successive capitalized letters
+are not allowed, e.g. a class "Zend_PDF" is not allowed while "Zend_Pdf" is acceptable.
+
diff --git a/manual/docs/Coding standards - Naming Conventions - Constants.php b/manual/docs/Coding standards - Naming Conventions - Constants.php
new file mode 100644
index 000000000..4d0e67a1b
--- /dev/null
+++ b/manual/docs/Coding standards - Naming Conventions - Constants.php
@@ -0,0 +1,10 @@
+Following rules must apply to all constants used within Doctrine framework:
+
+- Constants may contain both alphanumeric characters and the underscore.
+
+- Constants must always have all letters capitalized.
+
+- For readablity reasons, words in constant names must be separated by underscore characters. For example, ATTR_EXC_LOGGING is permitted but ATTR_EXCLOGGING is not.
+
+- Constants must be defined as class members by using the "const" construct. Defining constants in the global scope with "define" is NOT permitted.
+
diff --git a/manual/docs/Coding standards - Naming Conventions - Filenames.php b/manual/docs/Coding standards - Naming Conventions - Filenames.php
new file mode 100644
index 000000000..7dbebdd9c
--- /dev/null
+++ b/manual/docs/Coding standards - Naming Conventions - Filenames.php
@@ -0,0 +1,14 @@
+
+- For all other files, only alphanumeric characters, underscores, and the dash character ("-") are permitted. Spaces are prohibited.
+
+
+
+- Any file that contains any PHP code must end with the extension ".php". These examples show the acceptable filenames for containing the class names from the examples in the section above:
+
+Doctrine/Db.php
+
+Doctrine/Connection/Transaction.php
+
+
+- File names must follow the mapping to class names described above.
+
diff --git a/manual/docs/Coding standards - Naming Conventions - Functions and methods.php b/manual/docs/Coding standards - Naming Conventions - Functions and methods.php
new file mode 100644
index 000000000..5511f1b7f
--- /dev/null
+++ b/manual/docs/Coding standards - Naming Conventions - Functions and methods.php
@@ -0,0 +1,20 @@
+
+- Function names may only contain alphanumeric characters. Underscores are not permitted. Numbers are permitted in function names but are discouraged.
+
+
+
+- Function names must always start with a lowercase letter. When a function name consists of more than one word, the first letter of each new word must be capitalized. This is commonly called the "studlyCaps" or "camelCaps" method.
+
+
+
+- Verbosity is encouraged. Function names should be as verbose as is practical to enhance the understandability of code.
+
+
+
+- For object-oriented programming, accessors for objects should always be prefixed with either "get" or "set". This applies to all classes except for Doctrine_Record which has some accessor methods prefixed with 'obtain' and 'assign'. The reason
+for this is that since all user defined ActiveRecords inherit Doctrine_Record, it should populate the get / set namespace as little as possible.
+
+
+
+- Functions in the global scope ("floating functions") are NOT permmitted. All static functions should be wrapped in a static class.
+
diff --git a/manual/docs/Coding standards - Naming Conventions - Interfaces.php b/manual/docs/Coding standards - Naming Conventions - Interfaces.php
new file mode 100644
index 000000000..5ef9578fc
--- /dev/null
+++ b/manual/docs/Coding standards - Naming Conventions - Interfaces.php
@@ -0,0 +1,9 @@
+
+- Interface classes must follow the same conventions as other classes (see above), however must end with the word "Interface"
+(unless the interface is approved not to contain it such as Doctrine_Overloadable). Some examples:
+
+
+Doctrine_DB_EventListener_Interface
+
+Doctrine_EventListener_Interface
+
diff --git a/manual/docs/Coding standards - Naming Conventions - Record columns.php b/manual/docs/Coding standards - Naming Conventions - Record columns.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/docs/Coding standards - Naming Conventions - Variables.php b/manual/docs/Coding standards - Naming Conventions - Variables.php
new file mode 100644
index 000000000..32b107b20
--- /dev/null
+++ b/manual/docs/Coding standards - Naming Conventions - Variables.php
@@ -0,0 +1,13 @@
+All variables must satisfy the following conditions:
+
+
+- Variable names may only contain alphanumeric characters. Underscores are not permitted. Numbers are permitted in variable names but are discouraged.
+
+
+
+- Variable names must always start with a lowercase letter and follow the "camelCaps" capitalization convention.
+
+
+
+- Verbosity is encouraged. Variables should always be as verbose as practical. Terse variable names such as "$i" and "$n" are discouraged for anything other than the smallest loop contexts. If a loop contains more than 20 lines of code, the variables for the indices need to have more descriptive names.
+
diff --git a/manual/docs/Coding standards - Overview - Goals.php b/manual/docs/Coding standards - Overview - Goals.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/docs/Coding standards - Overview - Scope.php b/manual/docs/Coding standards - Overview - Scope.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/docs/Coding standards - PHP File Formatting - General.php b/manual/docs/Coding standards - PHP File Formatting - General.php
new file mode 100644
index 000000000..5b095b690
--- /dev/null
+++ b/manual/docs/Coding standards - PHP File Formatting - General.php
@@ -0,0 +1,4 @@
+For files that contain only PHP code, the closing tag ("?>") is never permitted. It is not required by PHP. Not including it prevents trailing whitespace from being accidentally injected into the output.
+
+IMPORTANT: Inclusion of arbitrary binary data as permitted by __HALT_COMPILER() is prohibited from any Zend framework PHP file or files derived from them. Use of this feature is only permitted for special installation scripts.
+
diff --git a/manual/docs/Coding standards - PHP File Formatting - Indentation.php b/manual/docs/Coding standards - PHP File Formatting - Indentation.php
new file mode 100644
index 000000000..dcc2bc522
--- /dev/null
+++ b/manual/docs/Coding standards - PHP File Formatting - Indentation.php
@@ -0,0 +1 @@
+Use an indent of 4 spaces, with no tabs.
diff --git a/manual/docs/Coding standards - PHP File Formatting - Line termination.php b/manual/docs/Coding standards - PHP File Formatting - Line termination.php
new file mode 100644
index 000000000..b0a8fdda3
--- /dev/null
+++ b/manual/docs/Coding standards - PHP File Formatting - Line termination.php
@@ -0,0 +1,9 @@
+
+- Line termination is the standard way for Unix text files. Lines must end only with a linefeed (LF). Linefeeds are represented as ordinal 10, or hexadecimal 0x0A.
+
+
+- Do not use carriage returns (CR) like Macintosh computers (0x0D).
+
+
+- Do not use the carriage return/linefeed combination (CRLF) as Windows computers (0x0D, 0x0A).
+
diff --git a/manual/docs/Coding standards - PHP File Formatting - Maximum line length.php b/manual/docs/Coding standards - PHP File Formatting - Maximum line length.php
new file mode 100644
index 000000000..390c03d59
--- /dev/null
+++ b/manual/docs/Coding standards - PHP File Formatting - Maximum line length.php
@@ -0,0 +1 @@
+The target line length is 80 characters, i.e. developers should aim keep code as close to the 80-column boundary as is practical. However, longer lines are acceptable. The maximum length of any line of PHP code is 120 characters.
diff --git a/manual/documentation.php b/manual/documentation.php
index 6ee7d1077..9183af56b 100644
--- a/manual/documentation.php
+++ b/manual/documentation.php
@@ -44,7 +44,7 @@ function render($title,$t,$e) {
}
function render_block($name) {
- $h = new PHP_Highlight;
+
if(file_exists("docs/$name.php")) {
$c = file_get_contents("docs/$name.php");
if(substr($c,0,5) == "loadString($c);
print "";
@@ -65,7 +70,6 @@ function render_block($name) {
print $h->toHtml();
print "";
print "
";
- }
}
}
function array2path($array, $path = '') {
@@ -110,6 +114,7 @@ $menu = array("Getting started" =>
"Composite",
"Sequential")
),
+ /**
"Schema reference" =>
array(
"Data types" => array(
@@ -128,6 +133,7 @@ $menu = array("Getting started" =>
),
),
+ */
"Basic Components" =>
array(
"Manager"
@@ -368,7 +374,42 @@ $menu = array("Getting started" =>
"INSERT",
"UPDATE"),
),
- "Real world examples" => array("User management system","Forum application","Album lister")
+ "Real world examples" => array("User management system","Forum application","Album lister"),
+
+ "Coding standards" => array(
+ "Overview" =>
+ array(
+ "Scope",
+ "Goals"
+ ),
+ "PHP File Formatting" => array(
+ "General",
+ "Indentation",
+ "Maximum line length",
+ "Line termination"
+ ),
+
+ "Naming Conventions" => array(
+ "Classes",
+ "Interfaces",
+ "Filenames",
+ "Functions and methods",
+ "Variables",
+ "Constants",
+ "Record columns",
+ ),
+
+
+ "Coding Style" => array(
+ "PHP code demarcation",
+ "Strings",
+ "Arrays",
+ "Classes",
+ "Functions and methods",
+ "Control statements",
+ "Inline documentation"
+ ),
+ )
);
@@ -409,12 +450,12 @@ $menu = array("Getting started" =>
if( ! file_exists("docs/$title - $k - $v2.php")) {
$missing[0]++;
$str .= " [ doc ] ";
- //touch("docs/$title - $k - $v2.php");
+ touch("docs/$title - $k - $v2.php");
}
if( ! file_exists("codes/$title - $k - $v2.php")) {
$missing[1]++;
$str .= " [ code ] ";
- //touch("codes/$title - $k - $v2.php");
+ touch("codes/$title - $k - $v2.php");
}
@@ -427,12 +468,12 @@ $menu = array("Getting started" =>
if( ! file_exists("docs/$title - $t.php")) {
$missing[0]++;
$str .= " [ doc ] ";
- //touch("docs/$title - $t.php");
+ touch("docs/$title - $t.php");
}
if( ! file_exists("codes/$title - $t.php")) {
$missing[1]++;
$str .= " [ code ] ";
- //touch("codes/$title - $t.php");
+ touch("codes/$title - $t.php");
}
print "".$e." ".$t."$str
\n";
}