Skip to content

Commit fdacd0d

Browse files
author
Alex Paliarush
committed
MAGETWO-92260: GraphQL - Fix urlResolver query to support relative path #13
1 parent 909c430 commit fdacd0d

File tree

3 files changed

+29
-28
lines changed

3 files changed

+29
-28
lines changed

app/code/Magento/CmsUrlRewriteGraphQl/composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
"type": "magento2-module",
55
"require": {
66
"php": "~7.1.3||~7.2.0",
7-
"magento/framework": "*"
8-
7+
"magento/framework": "*",
8+
"magento/module-url-rewrite-graph-ql": "*",
9+
"magento/module-store": "*",
10+
"magento/module-cms": "*"
911
},
1012
"suggest": {
1113
"magento/module-cms-url-rewrite": "*",
12-
"magento/module-catalog-graph-ql": "*",
13-
"magento/module-url-rewrite-graph-ql": "*"
14+
"magento/module-catalog-graph-ql": "*"
1415
},
1516
"license": [
1617
"OSL-3.0",
Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"name" : "magento/module-url-rewrite-graph-ql",
3-
"description" : "N/A",
4-
"type" : "magento2-module",
5-
"require" : {
6-
"php" : "~7.1.3||~7.2.0",
7-
"magento/framework" : "*",
8-
"magento/module-url-rewrite" : "*",
2+
"name": "magento/module-url-rewrite-graph-ql",
3+
"description": "N/A",
4+
"type": "magento2-module",
5+
"require": {
6+
"php": "~7.1.3||~7.2.0",
7+
"magento/framework": "*",
8+
"magento/module-url-rewrite": "*",
99
"magento/module-store": "*"
10-
},
11-
"suggest" : {
12-
"magento/module-graph-ql" : "*"
13-
},
14-
"license" : [
15-
"OSL-3.0",
16-
"AFL-3.0"
17-
],
18-
"autoload" : {
19-
"files" : [
20-
"registration.php"
21-
],
22-
"psr-4" : {
23-
"Magento\\UrlRewriteGraphQl\\" : ""
24-
}
25-
}
10+
},
11+
"suggest": {
12+
"magento/module-graph-ql": "*"
13+
},
14+
"license": [
15+
"OSL-3.0",
16+
"AFL-3.0"
17+
],
18+
"autoload": {
19+
"files": [
20+
"registration.php"
21+
],
22+
"psr-4": {
23+
"Magento\\UrlRewriteGraphQl\\": ""
24+
}
25+
}
2626
}

dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private function validateComposerJsonFile($path)
144144
*/
145145
private function assertCodingStyle($contents)
146146
{
147-
$this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: no space before colon.');
147+
$this->assertNotRegExp('/" :\s*["{]/', $contents, 'Coding style: there should be no space before colon.');
148148
$this->assertNotRegExp('/":["{]/', $contents, 'Coding style: a space is necessary after colon.');
149149
}
150150

0 commit comments

Comments
 (0)