Skip to content

Commit 0781565

Browse files
authored
Merge pull request #340 from doctrine/13.0.x-merge-up-into-14.0.x_rZhfqtGw
Merge release 13.0.1 into 14.0.x
2 parents f9122e6 + 0affd62 commit 0781565

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.doctrine-project.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,29 @@
44
"slug": "coding-standard",
55
"docsSlug": "doctrine-coding-standard",
66
"versions": [
7+
{
8+
"name": "14.0",
9+
"branchName": "14.0.x",
10+
"slug": "14.0",
11+
"upcoming": true
12+
},
13+
{
14+
"name": "13.0",
15+
"branchName": "13.0.x",
16+
"slug": "13.0",
17+
"current": true
18+
},
719
{
820
"name": "12.0",
921
"branchName": "12.0.x",
1022
"slug": "12.0",
11-
"upcoming": true
23+
"maintained": false
1224
},
1325
{
1426
"name": "11.0",
1527
"branchName": "11.0.x",
1628
"slug": "11.0",
17-
"current": true,
18-
"aliases": [
19-
"current",
20-
"stable"
21-
]
29+
"maintained": false
2230
},
2331
{
2432
"name": "10.0",

lib/Doctrine/ruleset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@
623623
<!-- Require there be no space between increment/decrement operator and its operand -->
624624
<rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
625625
<!-- Require space after language constructs -->
626-
<rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
626+
<rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
627627
<!-- Require space around logical operators -->
628628
<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
629629
<!-- Forbid spaces around `->` operator -->

0 commit comments

Comments
 (0)