@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function __construct(array $config) |
34 | 34 | { |
35 | - $config['interfaces'] = [ |
|
35 | + $config[ 'interfaces' ] = [ |
|
36 | 36 | RetourInterface::getType(), |
37 | 37 | ]; |
38 | 38 | |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | protected function resolve($source, $arguments, $context, ResolveInfo $resolveInfo) |
46 | 46 | { |
47 | 47 | $fieldName = $resolveInfo->fieldName; |
48 | - $result = $source[$fieldName] ?? ''; |
|
48 | + $result = $source[ $fieldName ] ?? ''; |
|
49 | 49 | // Handle the `site` virtual field |
50 | 50 | if ($fieldName === 'site') { |
51 | 51 | $result = null; |
52 | - $siteId = $source['siteId'] ?? null; |
|
52 | + $siteId = $source[ 'siteId' ] ?? null; |
|
53 | 53 | if ($siteId) { |
54 | 54 | $site = Craft::$app->getSites()->getSiteById($siteId); |
55 | 55 | if ($site !== null) { |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | $siteId = $source->siteId; |
41 | 41 | } else { |
42 | 42 | // Otherwise, use the passed in arguments, or defaults |
43 | - $uri = $arguments['uri'] ?? '/'; |
|
44 | - $siteId = $arguments['siteId'] ?? null; |
|
45 | - if (isset($arguments['site'])) { |
|
46 | - $site = Craft::$app->getSites()->getSiteByHandle($arguments['site']); |
|
43 | + $uri = $arguments[ 'uri' ] ?? '/'; |
|
44 | + $siteId = $arguments[ 'siteId' ] ?? null; |
|
45 | + if (isset($arguments[ 'site' ])) { |
|
46 | + $site = Craft::$app->getSites()->getSiteByHandle($arguments[ 'site' ]); |
|
47 | 47 | if ($site !== null) { |
48 | 48 | $siteId = $site->id; |
49 | 49 | } |
@@ -63,11 +63,11 @@ discard block |
||
63 | 63 | |
64 | 64 | if ($redirect === null && Craft::$app->getElements()->getElementByUri(trim($uri, '/'), $siteId) === null) { |
65 | 65 | // Set the `site` virtual field |
66 | - $redirect['site'] = null; |
|
67 | - if (isset($redirect['siteId']) && (int)$redirect['siteId'] !== 0) { |
|
68 | - $site = Craft::$app->getSites()->getSiteById((int)$redirect['siteId']); |
|
66 | + $redirect[ 'site' ] = null; |
|
67 | + if (isset($redirect[ 'siteId' ]) && (int) $redirect[ 'siteId' ] !== 0) { |
|
68 | + $site = Craft::$app->getSites()->getSiteById((int) $redirect[ 'siteId' ]); |
|
69 | 69 | if ($site !== null) { |
70 | - $redirect['site'] = $site->handle; |
|
70 | + $redirect[ 'site' ] = $site->handle; |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | // Increment the stats |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | */ |
91 | 91 | public static function resolveAll($source, array $arguments, $context, ResolveInfo $resolveInfo) |
92 | 92 | { |
93 | - $siteId = $arguments['siteId'] ?? Craft::$app->getSites()->getCurrentSite()->id; |
|
93 | + $siteId = $arguments[ 'siteId' ] ?? Craft::$app->getSites()->getCurrentSite()->id; |
|
94 | 94 | |
95 | 95 | $redirects = Retour::$plugin->redirects->getAllStaticRedirects(null, $siteId); |
96 | 96 |