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

Commit0ce4b70

Browse files
committed
Merge branch '2.0' into 2.1
2 parents73daebf +774e7da commit0ce4b70

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

‎contributing/code/standards.rst‎

Lines changed: 12 additions & 10 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

@@ -108,9 +108,11 @@ Naming Conventions
108108

109109
* Use namespaces for all classes;
110110

111-
* Abstract classes are often prefixed with `Abstract`;
111+
* Abstract classes are often prefixed with ``Abstract``;
112+
113+
* Suffix interfaces with ``Interface``;
112114

113-
* Suffixinterfaces with `Interface`;
115+
* Suffixtraits with ``Trait``;
114116

115117
* Use alphanumeric characters and underscores for file names;
116118

@@ -122,9 +124,9 @@ Documentation
122124

123125
* Add PHPDoc blocks for all classes, methods, and functions;
124126

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

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

129131
License
130132
-------

‎cookbook/map.rst.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
***Deployment**
4343

44-
* :doc:`/cookbook/deployment-tools`
44+
* :doc:`/cookbook/deployment-tools`
4545

4646
* :doc:`/cookbook/doctrine/index`
4747

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp