Skip to content

Commit 3496109

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '9.19' into 10.0
2 parents 954ca1c + 4c6db34 commit 3496109

File tree

11 files changed

+121
-10
lines changed

11 files changed

+121
-10
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CHANGE LOG
22
==========
33

44

5-
## 10.0.0 (UPCOMING)
5+
## 10.0.0-RC1 (UPCOMING)
66

77
* Removed all deprecated functionality
88
* Switched to PSR-17 and PSR-18
@@ -11,15 +11,12 @@ CHANGE LOG
1111
* Redesigned pagination
1212
* Added array types where missing
1313
* Added scalar param types
14-
15-
16-
## 9.19.0 (UPCOMING)
17-
1814
* Added user events API
1915

2016

21-
## 9.18.1 (UPCOMING)
17+
## 9.18.1 (22/07/2020)
2218

19+
* Fixed error in getHeader function
2320
* Fixed incorrect param type doc
2421

2522

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ $ composer require zeichen32/gitlabapibundle:^5.0 symfony/http-client:^4.4 nyhol
5555

5656
#### Symfony 5:
5757

58+
5859
```
5960
$ composer require zeichen32/gitlabapibundle:^5.0 symfony/http-client:^5.0 nyholm/psr7:^1.3
6061
```

‎rector.yml

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ parameters:
1010
- 'src'
1111
- 'tests'
1212
sets:
13-
- 'code-quality'
1413
- 'php52'
1514
- 'php53'
1615
- 'php54'
@@ -25,6 +24,52 @@ parameters:
2524
- 'phpunit75'
2625

2726
services:
27+
Rector\CodeQuality\Rector\Ternary\ArrayKeyExistsTernaryThenValueToCoalescingRector: ~
28+
Rector\CodeQuality\Rector\FuncCall\ArrayKeysAndInArrayToArrayKeyExistsRector: ~
29+
Rector\CodeQuality\Rector\FuncCall\ArrayMergeOfNonArraysToSimpleArrayRector: ~
30+
Rector\CodeQuality\Rector\Identical\BooleanNotIdenticalToNotIdenticalRector: ~
31+
Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector: ~
32+
Rector\CodeQuality\Rector\If_\CombineIfRector: ~
33+
Rector\CodeQuality\Rector\Assign\CombinedAssignRector: ~
34+
Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector: ~
35+
Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector: ~
36+
Rector\CodeQuality\Rector\If_\ConsecutiveNullCompareReturnsToNullCoalesceQueueRector: ~
37+
Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector: ~
38+
Rector\CodeQuality\Rector\Foreach_\ForeachToInArrayRector: ~
39+
Rector\CodeQuality\Rector\FuncCall\InArrayAndArrayKeysToArrayKeyExistsRector: ~
40+
Rector\CodeQuality\Rector\BinaryOp\InlineIfToExplicitIfRector: ~
41+
Rector\CodeQuality\Rector\FuncCall\IntvalToTypeCastRector: ~
42+
Rector\CodeQuality\Rector\FuncCall\IsAWithStringWithThirdArgumentRector: ~
43+
Rector\CodeQuality\Rector\If_\RemoveAlwaysTrueConditionSetInConstructorRector: ~
44+
Rector\CodeQuality\Rector\FuncCall\RemoveSoleValueSprintfRector: ~
45+
Rector\CodeQuality\Rector\If_\ShortenElseIfRector: ~
46+
Rector\CodeQuality\Rector\Identical\SimplifyArraySearchRector: ~
47+
Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector: ~
48+
Rector\CodeQuality\Rector\Identical\SimplifyConditionsRector: ~
49+
Rector\CodeQuality\Rector\Ternary\SimplifyDuplicatedTernaryRector: ~
50+
Rector\CodeQuality\Rector\Foreach_\SimplifyForeachToCoalescingRector: ~
51+
Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector: ~
52+
Rector\CodeQuality\Rector\If_\SimplifyIfIssetToNullCoalescingRector: ~
53+
Rector\CodeQuality\Rector\If_\SimplifyIfNotNullReturnRector: ~
54+
Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector: ~
55+
Rector\CodeQuality\Rector\FuncCall\SimplifyInArrayValuesRector: ~
56+
Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector: ~
57+
Rector\CodeQuality\Rector\Ternary\SimplifyTautologyTernaryRector: ~
58+
Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector: ~
59+
Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector: ~
60+
Rector\CodeQuality\Rector\Assign\SplitListAssignToSeparateLineRector: ~
61+
Rector\CodeQuality\Rector\FuncCall\StrlenZeroToIdenticalEmptyStringRector: ~
62+
Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector: ~
63+
Rector\CodeQuality\Rector\Equal\UseIdenticalOverEqualWithSameTypeRector: ~
64+
Rector\CodingStyle\Rector\FuncCall\ConsistentImplodeRector: ~
65+
Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector: ~
66+
Rector\CodingStyle\Rector\FuncCall\FunctionCallToConstantRector: ~
67+
Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector: ~
68+
Rector\CodingStyle\Rector\If_\NullableCompareToNullRector: ~
69+
Rector\CodingStyle\Rector\FuncCall\SimpleArrayCallableToStringRector: ~
70+
Rector\CodingStyle\Rector\ClassConst\SplitGroupedConstantsAndPropertiesRector: ~
71+
Rector\CodingStyle\Rector\ClassConst\VarConstantCommentRector: ~
72+
Rector\CodingStyle\Rector\FuncCall\VersionCompareFuncCallToConstantRector: ~
2873
Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector: ~
2974
Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector: ~
3075
Rector\DeadCode\Rector\Assign\RemoveAssignOfVoidReturnFunctionRector: ~

‎src/Api/GroupsMilestones.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66

77
class GroupsMilestones extends AbstractApi
88
{
9+
/**
10+
* @var string
11+
*/
912
public const STATE_ACTIVE = 'active';
1013

14+
/**
15+
* @var string
16+
*/
1117
public const STATE_CLOSED = 'closed';
1218

1319
/**

‎src/Api/Issues.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,14 @@
88

99
class Issues extends AbstractApi
1010
{
11+
/**
12+
* @var string
13+
*/
1114
public const STATE_OPENED = 'opened';
1215

16+
/**
17+
* @var string
18+
*/
1319
public const STATE_CLOSED = 'closed';
1420

1521
/**

‎src/Api/Jobs.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,44 @@
99

1010
class Jobs extends AbstractApi
1111
{
12+
/**
13+
* @var string
14+
*/
1215
public const SCOPE_CREATED = 'created';
1316

17+
/**
18+
* @var string
19+
*/
1420
public const SCOPE_PENDING = 'pending';
1521

22+
/**
23+
* @var string
24+
*/
1625
public const SCOPE_RUNNING = 'running';
1726

27+
/**
28+
* @var string
29+
*/
1830
public const SCOPE_FAILED = 'failed';
1931

32+
/**
33+
* @var string
34+
*/
2035
public const SCOPE_SUCCESS = 'success';
2136

37+
/**
38+
* @var string
39+
*/
2240
public const SCOPE_CANCELED = 'canceled';
2341

42+
/**
43+
* @var string
44+
*/
2445
public const SCOPE_SKIPPED = 'skipped';
2546

47+
/**
48+
* @var string
49+
*/
2650
public const SCOPE_MANUAL = 'manual';
2751

2852
/**

‎src/Api/MergeRequests.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,24 @@
1010

1111
class MergeRequests extends AbstractApi
1212
{
13+
/**
14+
* @var string
15+
*/
1316
public const STATE_ALL = 'all';
1417

18+
/**
19+
* @var string
20+
*/
1521
public const STATE_MERGED = 'merged';
1622

23+
/**
24+
* @var string
25+
*/
1726
public const STATE_OPENED = 'opened';
1827

28+
/**
29+
* @var string
30+
*/
1931
public const STATE_CLOSED = 'closed';
2032

2133
/**

‎src/Api/Milestones.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@
66

77
class Milestones extends AbstractApi
88
{
9+
/**
10+
* @var string
11+
*/
912
public const STATE_ACTIVE = 'active';
1013

14+
/**
15+
* @var string
16+
*/
1117
public const STATE_CLOSED = 'closed';
1218

1319
/**

‎src/Api/Repositories.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@
99

1010
class Repositories extends AbstractApi
1111
{
12+
/**
13+
* @var string
14+
*/
1215
public const TYPE_BRANCH = 'branch';
1316

17+
/**
18+
* @var string
19+
*/
1420
public const TYPE_TAG = 'tag';
1521

1622
/**

‎vendor-bin/phpstan/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"require": {
33
"phpstan/phpstan": "~0.12.33",
4-
"phpstan/phpstan-deprecation-rules": "~0.12.4",
5-
"phpstan/phpstan-strict-rules": "~0.12.3",
4+
"phpstan/phpstan-deprecation-rules": "~0.12.5",
5+
"phpstan/phpstan-strict-rules": "~0.12.4",
66
"thecodingmachine/phpstan-strict-rules": "~0.12.0",
77
"ergebnis/phpstan-rules": "~0.15.0"
88
},

‎vendor-bin/rector/composer.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
{
22
"require": {
3-
"rector/rector": "~0.7.48"
3+
"phpstan/phpstan": "0.12.32",
4+
"rector/rector": "0.7.48",
5+
"symplify/auto-bind-parameter": "8.1.13",
6+
"symplify/autowire-array-parameter": "8.1.13",
7+
"symplify/console-color-diff": "8.1.13",
8+
"symplify/package-builder": "8.1.13",
9+
"symplify/parameter-name-guard": "8.1.13",
10+
"symplify/set-config-resolver": "8.1.13",
11+
"symplify/smart-file-system": "8.1.13"
412
},
513
"config": {
614
"preferred-install": "dist"

0 commit comments

Comments
 (0)