Commit cb3ac6a
committed
Merge branch '3.3' into 3.4
* 3.3:
[#8195] fix requirement checker binary
Simplified the requirements article
[#6030] Simplifying and showing code
Clearify behaviour of Blank and NotBlank validator
[#5838] Tweaking comment - the phpdoc policy is not concrete
Update standards to match actual practices
Updated the requirements article for Smyfony 3.3
Updated the Requirements article for Symfony 3.2
Updated the Requirements article for Symfony 2.8File tree
Expand file treeCollapse file tree
4 files changed
+40
-47
lines changedOpen diff view settings
Filter options
- contributing/code
- reference
- constraints
Expand file treeCollapse file tree
4 files changed
+40
-47
lines changedOpen diff view settings
Collapse file
contributing/code/standards.rst
Copy file name to clipboardExpand all lines: contributing/code/standards.rst+2-1Lines changed: 2 additions & 1 deletion
- Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
226 | 226 | |
227 | 227 | |
228 | 228 | |
229 | | - |
| 229 | + |
| 230 | + |
230 | 231 | |
231 | 232 | |
232 | 233 | |
|
Collapse file
reference/constraints/Blank.rst
Copy file name to clipboardExpand all lines: reference/constraints/Blank.rst+12-4Lines changed: 12 additions & 4 deletions
- Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
1 | 1 | |
2 | 2 | |
3 | 3 | |
4 | | - |
5 | | - |
6 | | - |
7 | | - |
| 4 | + |
| 5 | + |
| 6 | + |
| 7 | + |
| 8 | + |
| 9 | + |
| 10 | + |
| 11 | + |
| 12 | + |
| 13 | + |
| 14 | + |
| 15 | + |
8 | 16 | |
9 | 17 | |
10 | 18 | |
|
Collapse file
reference/constraints/NotBlank.rst
Copy file name to clipboardExpand all lines: reference/constraints/NotBlank.rst+8-3Lines changed: 8 additions & 3 deletions
- Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
1 | 1 | |
2 | 2 | |
3 | 3 | |
4 | | - |
5 | | - |
6 | | - |
| 4 | + |
| 5 | + |
| 6 | + |
| 7 | + |
| 8 | + |
| 9 | + |
| 10 | + |
| 11 | + |
7 | 12 | |
8 | 13 | |
9 | 14 | |
|
Collapse file
+18-39Lines changed: 18 additions & 39 deletions
- Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
6 | 6 | |
7 | 7 | |
8 | 8 | |
9 | | - |
10 | | - |
11 | | - |
12 | | - |
13 | | - |
| 9 | + |
| 10 | + |
| 11 | + |
14 | 12 | |
15 | | - |
16 | | - |
17 | | - |
18 | | - |
19 | | - |
| 13 | + |
| 14 | + |
20 | 15 | |
21 | | - |
22 | | - |
| 16 | + |
| 17 | + |
23 | 18 | |
24 | | - |
25 | | - |
26 | | - |
27 | | - |
| 19 | + |
| 20 | + |
28 | 21 | |
29 | | - |
30 | | - |
| 22 | + |
| 23 | + |
31 | 24 | |
32 | | - |
33 | | - |
34 | | - |
35 | | - |
36 | | - |
37 | | - |
38 | | - |
39 | | - |
40 | | - |
| 25 | + |
| 26 | + |
41 | 27 | |
42 | | - |
43 | | - |
44 | | - |
45 | | - |
| 28 | + |
| 29 | + |
46 | 30 | |
47 | | - |
48 | | - |
49 | | - |
50 | | - |
51 | | - |
52 | | - |
| 31 | + |
53 | 32 | |
54 | | - |
55 | | - |
| 33 | + |
| 34 | + |
0 commit comments