Skip to content

Commit ab1b11c

Browse files
mcg-webmcg-web
authored
Merge pull request #1041 from sparklink-pro/master
Fix tests & update php-documentor to ^1.6.1
2 parents 455a72a + 0d8dea5 commit ab1b11c

File tree

6 files changed

+88
-88
lines changed

6 files changed

+88
-88
lines changed

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"ext-json": "*",
3434
"murtukov/php-code-generator": "^0.1.5",
3535
"phpdocumentor/reflection-docblock": "^5.2",
36-
"phpdocumentor/type-resolver": ">1.4.0,<1.6.0",
36+
"phpdocumentor/type-resolver": "^1.6.1",
3737
"psr/log": "^1.0 || ^2.0 || ^3.0",
3838
"symfony/config": "^5.4 || ^6.0",
3939
"symfony/dependency-injection": "^5.4 || ^6.0",

‎tests/Config/Parser/MetadataParser/TypeGuesser/DocBlockTypeGuesserTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function guessErrorDataProvider(): iterable
8888
yield ['mixed[]', $reflectorClass, 'Tag @'.$tag.' found, but the array values cannot be mixed type'];
8989
yield ['array<mixed>', $reflectorClass, 'Tag @'.$tag.' found, but the array values cannot be mixed type'];
9090
yield ['', $reflectorClass, 'No @'.$tag.' tag found in doc block or tag has no type'];
91-
yield ['[]', $reflectorClass, 'Doc Block parsing failed'];
91+
yield ['[]', $reflectorClass, 'No @'.$tag.' tag found in doc block or tag has no type'];
9292
}
9393
}
9494

‎tests/Functional/Command/fixtures/schema.descriptions.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,47 +1094,47 @@
10941094
"deprecationReason": null
10951095
},
10961096
{
1097-
"name": "args",
1097+
"name": "isRepeatable",
10981098
"description": null,
10991099
"args": [],
11001100
"type": {
11011101
"kind": "NON_NULL",
11021102
"name": null,
11031103
"ofType": {
1104-
"kind": "LIST",
1105-
"name": null,
1106-
"ofType": {
1107-
"kind": "NON_NULL",
1108-
"name": null,
1109-
"ofType": {
1110-
"kind": "OBJECT",
1111-
"name": "__InputValue",
1112-
"ofType": null
1113-
}
1114-
}
1104+
"kind": "SCALAR",
1105+
"name": "Boolean",
1106+
"ofType": null
11151107
}
11161108
},
11171109
"isDeprecated": false,
11181110
"deprecationReason": null
11191111
},
11201112
{
1121-
"name": "isRepeatable",
1113+
"name": "locations",
11221114
"description": null,
11231115
"args": [],
11241116
"type": {
11251117
"kind": "NON_NULL",
11261118
"name": null,
11271119
"ofType": {
1128-
"kind": "SCALAR",
1129-
"name": "Boolean",
1130-
"ofType": null
1120+
"kind": "LIST",
1121+
"name": null,
1122+
"ofType": {
1123+
"kind": "NON_NULL",
1124+
"name": null,
1125+
"ofType": {
1126+
"kind": "ENUM",
1127+
"name": "__DirectiveLocation",
1128+
"ofType": null
1129+
}
1130+
}
11311131
}
11321132
},
11331133
"isDeprecated": false,
11341134
"deprecationReason": null
11351135
},
11361136
{
1137-
"name": "locations",
1137+
"name": "args",
11381138
"description": null,
11391139
"args": [],
11401140
"type": {
@@ -1147,8 +1147,8 @@
11471147
"kind": "NON_NULL",
11481148
"name": null,
11491149
"ofType": {
1150-
"kind": "ENUM",
1151-
"name": "__DirectiveLocation",
1150+
"kind": "OBJECT",
1151+
"name": "__InputValue",
11521152
"ofType": null
11531153
}
11541154
}
@@ -1346,7 +1346,7 @@
13461346
"args": [
13471347
{
13481348
"name": "reason",
1349-
"description": "Explains why this element was deprecated, usually also including a suggestion for how to access supported similar data. Formatted using the Markdown syntax (as specified by [CommonMark](https://commonmark.org/).",
1349+
"description": "Explains why this element was deprecated, usually also including a suggestion for how to access supported similar data. Formatted using the Markdown syntax, as specified by [CommonMark](https://commonmark.org/).",
13501350
"type": {
13511351
"kind": "SCALAR",
13521352
"name": "String",

‎tests/Functional/Command/fixtures/schema.graphql‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
"""Information about pagination in a connection."""
2-
type PageInfo {
3-
"""When paginating forwards, are there more items?"""
4-
hasNextPage: Boolean!
5-
6-
"""When paginating backwards, are there more items?"""
7-
hasPreviousPage: Boolean!
8-
9-
"""When paginating backwards, the cursor to continue."""
10-
startCursor: String
11-
12-
"""When paginating forwards, the cursor to continue."""
13-
endCursor: String
14-
}
15-
161
type Query {
172
user: User
183
}
194

205
type User {
21-
"""the user name"""
6+
"the user name"
227
name: String
238

249
friends(after: String, first: Int, before: String, last: Int): friendConnection
2510
friendsForward(after: String, first: Int): userConnection
2611
friendsBackward(before: String, last: Int): userConnection
2712
}
2813

29-
"""A connection to a list of items."""
14+
"A connection to a list of items."
3015
type friendConnection {
3116
totalCount: Int
3217

33-
"""Information to aid in pagination."""
18+
"Information to aid in pagination."
3419
pageInfo: PageInfo!
3520

36-
"""Information to aid in pagination."""
21+
"Information to aid in pagination."
3722
edges: [friendEdge]
3823
}
3924

40-
"""An edge in a connection."""
25+
"Information about pagination in a connection."
26+
type PageInfo {
27+
"When paginating forwards, are there more items?"
28+
hasNextPage: Boolean!
29+
30+
"When paginating backwards, are there more items?"
31+
hasPreviousPage: Boolean!
32+
33+
"When paginating backwards, the cursor to continue."
34+
startCursor: String
35+
36+
"When paginating forwards, the cursor to continue."
37+
endCursor: String
38+
}
39+
40+
"An edge in a connection."
4141
type friendEdge {
4242
friendshipTime: String
4343

44-
"""The item at the end of the edge."""
44+
"The item at the end of the edge."
4545
node: User
4646

47-
"""A cursor for use in pagination."""
47+
"A cursor for use in pagination."
4848
cursor: String!
4949
}
5050

51-
"""A connection to a list of items."""
51+
"A connection to a list of items."
5252
type userConnection {
53-
"""Information to aid in pagination."""
53+
"Information to aid in pagination."
5454
pageInfo: PageInfo!
5555

56-
"""Information to aid in pagination."""
56+
"Information to aid in pagination."
5757
edges: [userEdge]
5858
}
5959

60-
"""An edge in a connection."""
60+
"An edge in a connection."
6161
type userEdge {
62-
"""The item at the end of the edge."""
62+
"The item at the end of the edge."
6363
node: User
6464

65-
"""A cursor for use in pagination."""
65+
"A cursor for use in pagination."
6666
cursor: String!
6767
}

‎tests/Functional/Command/fixtures/schema.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -622,45 +622,45 @@
622622
"deprecationReason": null
623623
},
624624
{
625-
"name": "args",
625+
"name": "isRepeatable",
626626
"args": [],
627627
"type": {
628628
"kind": "NON_NULL",
629629
"name": null,
630630
"ofType": {
631-
"kind": "LIST",
632-
"name": null,
633-
"ofType": {
634-
"kind": "NON_NULL",
635-
"name": null,
636-
"ofType": {
637-
"kind": "OBJECT",
638-
"name": "__InputValue",
639-
"ofType": null
640-
}
641-
}
631+
"kind": "SCALAR",
632+
"name": "Boolean",
633+
"ofType": null
642634
}
643635
},
644636
"isDeprecated": false,
645637
"deprecationReason": null
646638
},
647639
{
648-
"name": "isRepeatable",
640+
"name": "locations",
649641
"args": [],
650642
"type": {
651643
"kind": "NON_NULL",
652644
"name": null,
653645
"ofType": {
654-
"kind": "SCALAR",
655-
"name": "Boolean",
656-
"ofType": null
646+
"kind": "LIST",
647+
"name": null,
648+
"ofType": {
649+
"kind": "NON_NULL",
650+
"name": null,
651+
"ofType": {
652+
"kind": "ENUM",
653+
"name": "__DirectiveLocation",
654+
"ofType": null
655+
}
656+
}
657657
}
658658
},
659659
"isDeprecated": false,
660660
"deprecationReason": null
661661
},
662662
{
663-
"name": "locations",
663+
"name": "args",
664664
"args": [],
665665
"type": {
666666
"kind": "NON_NULL",
@@ -672,8 +672,8 @@
672672
"kind": "NON_NULL",
673673
"name": null,
674674
"ofType": {
675-
"kind": "ENUM",
676-
"name": "__DirectiveLocation",
675+
"kind": "OBJECT",
676+
"name": "__InputValue",
677677
"ofType": null
678678
}
679679
}

‎tests/Functional/Command/fixtures/schema.modern.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -623,45 +623,45 @@
623623
"deprecationReason": null
624624
},
625625
{
626-
"name": "args",
626+
"name": "isRepeatable",
627627
"args": [],
628628
"type": {
629629
"kind": "NON_NULL",
630630
"name": null,
631631
"ofType": {
632-
"kind": "LIST",
633-
"name": null,
634-
"ofType": {
635-
"kind": "NON_NULL",
636-
"name": null,
637-
"ofType": {
638-
"kind": "OBJECT",
639-
"name": "__InputValue",
640-
"ofType": null
641-
}
642-
}
632+
"kind": "SCALAR",
633+
"name": "Boolean",
634+
"ofType": null
643635
}
644636
},
645637
"isDeprecated": false,
646638
"deprecationReason": null
647639
},
648640
{
649-
"name": "isRepeatable",
641+
"name": "locations",
650642
"args": [],
651643
"type": {
652644
"kind": "NON_NULL",
653645
"name": null,
654646
"ofType": {
655-
"kind": "SCALAR",
656-
"name": "Boolean",
657-
"ofType": null
647+
"kind": "LIST",
648+
"name": null,
649+
"ofType": {
650+
"kind": "NON_NULL",
651+
"name": null,
652+
"ofType": {
653+
"kind": "ENUM",
654+
"name": "__DirectiveLocation",
655+
"ofType": null
656+
}
657+
}
658658
}
659659
},
660660
"isDeprecated": false,
661661
"deprecationReason": null
662662
},
663663
{
664-
"name": "locations",
664+
"name": "args",
665665
"args": [],
666666
"type": {
667667
"kind": "NON_NULL",
@@ -673,8 +673,8 @@
673673
"kind": "NON_NULL",
674674
"name": null,
675675
"ofType": {
676-
"kind": "ENUM",
677-
"name": "__DirectiveLocation",
676+
"kind": "OBJECT",
677+
"name": "__InputValue",
678678
"ofType": null
679679
}
680680
}

0 commit comments

Comments
 (0)