summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/general
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-22 10:15:01 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-22 10:15:01 +0100
commit21898a45f323bb74ef6e5ee8cf21c3397467665b (patch)
treed373ff858e9620c08a790d578d8ff07b745a31fe /user_guide_src/source/general
parent4a183078d782016cd1aaa74cb1762718638609b8 (diff)
parent93d98b611051bf123532a0d30ebe97480ae4a3b4 (diff)
Merge pull request #3490 from vlakoff/file_endings
[ci skip] Remove closing blocks at end of PHP files
Diffstat (limited to 'user_guide_src/source/general')
-rw-r--r--user_guide_src/source/general/creating_libraries.rst2
-rw-r--r--user_guide_src/source/general/styleguide.rst27
2 files changed, 2 insertions, 27 deletions
diff --git a/user_guide_src/source/general/creating_libraries.rst b/user_guide_src/source/general/creating_libraries.rst
index 0e3ae4c85..d6b0631af 100644
--- a/user_guide_src/source/general/creating_libraries.rst
+++ b/user_guide_src/source/general/creating_libraries.rst
@@ -54,8 +54,6 @@ Classes should have this basic prototype::
}
}
- /* End of file Someclass.php */
-
.. note:: We are using the name Someclass purely as an example.
Using Your Class
diff --git a/user_guide_src/source/general/styleguide.rst b/user_guide_src/source/general/styleguide.rst
index b27031a7b..7704a59c5 100644
--- a/user_guide_src/source/general/styleguide.rst
+++ b/user_guide_src/source/general/styleguide.rst
@@ -52,31 +52,8 @@ The PHP closing tag on a PHP document **?>** is optional to the PHP
parser. However, if used, any whitespace following the closing tag,
whether introduced by the developer, user, or an FTP application, can
cause unwanted output, PHP errors, or if the latter are suppressed,
-blank pages. For this reason, all PHP files should **OMIT** the closing
-PHP tag, and instead use a comment block to mark the end of file and
-its location relative to the application root. This allows you to still
-identify a file as being complete and not truncated.
-
-**INCORRECT**::
-
- <?php
-
- echo "Here's my code!";
-
- ?>
-
-**CORRECT**::
-
- <?php
-
- echo "Here's my code!";
-
- /* End of file Myfile.php */
- /* Location: ./system/modules/mymodule/myfile.php */
-
-.. note:: There should be no empty line or newline character(s) following
- the closing comments. If you happen to see one when
- submitting a pull request, please check your IDE settings and fix it.
+blank pages. For this reason, all PHP files MUST OMIT the PHP closing
+tag and end with a single empty line instead.
File Naming
===========