Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit6e7970e

Browse files
committed
Merge branch 'patch-24' of git://github.com/WouterJ/symfony-docs into WouterJ-patch-24
Conflicts:contributing/code/standards.rst
2 parentse7e97bf +d5fc5ba commit6e7970e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

‎contributing/code/standards.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ documents.
1515
Since a picture - or some code - is worth a thousand words, here's a short
1616
example containing most features described below:
1717

18-
..code-block::php
18+
..code-block::php+html
1919

2020
<?php
2121

@@ -40,7 +40,7 @@ example containing most features described below:
4040
private $fooBar;
4141

4242
/**
43-
* @param string $dummy Some argument description
43+
* @param string $dummyy Some argument description
4444
*/
4545
public function __construct($dummy)
4646
{
@@ -82,17 +82,17 @@ Structure
8282

8383
* Add a single space after each comma delimiter;
8484

85-
* Add a single space around operators (`==`, `&&`, ...);
85+
* Add a single space around operators (``==``, ``&&``, ...);
8686

87-
* Add a blank line before `return` statements, unless the return is alone
88-
inside a statement-group (like an `if` statement);
87+
* Add a blank line before ``return`` statements, unless the return is alone
88+
inside a statement-group (like an ``if`` statement);
8989

9090
* Use braces to indicate control structure body regardless of the number of
9191
statements it contains;
9292

9393
* Define one class per file - this does not apply to private helper classes
9494
that are not intended to be instantiated from the outside and thus are not
95-
concerned by the PSR-0 standard;
95+
concerned by the`PSR-0`_ standard;
9696

9797
* Declare class properties before methods;
9898

@@ -124,9 +124,9 @@ Documentation
124124

125125
* Add PHPDoc blocks for all classes, methods, and functions;
126126

127-
* Omit the `@return` tag if the method does not return anything;
127+
* Omit the ``@return`` tag if the method does not return anything;
128128

129-
* The `@package` and `@subpackage` annotations are not used.
129+
* The ``@package`` and ``@subpackage`` annotations are not used.
130130

131131
License
132132
-------

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp