summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-02-09 11:43:37 +0800
committerXinchen Hui <laruence@php.net>2015-02-09 11:43:37 +0800
commit0698901051c1356e054ac67ac065880b23f60f6f (patch)
tree2f43cbc823360335f4a2c165ccf4eddb5c1a5b42
parent2a4ed626ca0307e37d82271de0c0c79efffad6b2 (diff)
parent90ade856155103acaa30d6abbb55b3c304b808b3 (diff)
downloadphp-git-0698901051c1356e054ac67ac065880b23f60f6f.tar.gz
Merge branch 'master' of https://github.com/NikV/php-src
-rw-r--r--CODING_STANDARDS2
-rw-r--r--README.TESTING5
2 files changed, 5 insertions, 2 deletions
diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index 2664d12bd5..0cfcff18f6 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -18,6 +18,7 @@ Code Implementation
For instance, ``function int mail(char *to, char *from)`` should NOT free
to and/or from.
+
Exceptions:
- The function's designated behavior is freeing that resource. E.g. efree()
@@ -112,6 +113,7 @@ User Functions/Methods Naming Conventions
of ``parent_*``::
A family of 'foo' functions, for example:
+
Good:
'foo_select_bar'
'foo_insert_baz'
diff --git a/README.TESTING b/README.TESTING
index dd09ecbe38..719105daba 100644
--- a/README.TESTING
+++ b/README.TESTING
@@ -104,7 +104,8 @@ The php file will be generated always.
NOTE: You can set environment variable TEST_PHP_DETAILED to enable
detailed test information.
-[Automated testing]
+[Automated Testing]
+--------------
If you like to keep up to speed, with latest developments and quality
assurance, setting the environment variable NO_INTERACTION to 1, will not
prompt the tester for any user input.
@@ -142,7 +143,7 @@ then
fi
========== end of qa-test.sh =============
-NOTE: the exit status of run-tests.php will be 1 when
+NOTE: The exit status of run-tests.php will be 1 when
REPORT_EXIT_STATUS is set. The result of "make test" may be higher
than that. At present, gmake 3.79.1 returns 2, so it is
advised to test for non-zero, rather then a specific value.