@@ -20,7 +20,7 @@ |
||
| 20 | 20 | // Update retour widget type |
| 21 | 21 | $this->update('{{%widgets}}', [ |
| 22 | 22 | 'type' => RetourWidget::class |
| 23 | - ], ['type' => 'Retour']); |
|
| 23 | + ], [ 'type' => 'Retour' ]); |
|
| 24 | 24 | |
| 25 | 25 | return true; |
| 26 | 26 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | // Protected Properties |
| 42 | 42 | // ========================================================================= |
| 43 | 43 | |
| 44 | - protected $allowAnonymous = []; |
|
| 44 | + protected $allowAnonymous = [ ]; |
|
| 45 | 45 | |
| 46 | 46 | // Public Methods |
| 47 | 47 | // ========================================================================= |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function actionRedirects(string $siteHandle = null): Response |
| 59 | 59 | { |
| 60 | - $variables = []; |
|
| 60 | + $variables = [ ]; |
|
| 61 | 61 | PermissionHelper::controllerPermissionCheck('retour:redirects'); |
| 62 | 62 | // Get the site to edit |
| 63 | 63 | $siteId = MultiSiteHelper::getSiteIdFromHandle($siteHandle); |
@@ -70,32 +70,32 @@ discard block |
||
| 70 | 70 | } catch (InvalidConfigException $e) { |
| 71 | 71 | Craft::error($e->getMessage(), __METHOD__); |
| 72 | 72 | } |
| 73 | - $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl( |
|
| 73 | + $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl( |
|
| 74 | 74 | '@nystudio107/retour/assetbundles/retour/dist', |
| 75 | 75 | true |
| 76 | 76 | ); |
| 77 | 77 | // Enabled sites |
| 78 | 78 | MultiSiteHelper::setMultiSiteVariables($siteHandle, $siteId, $variables); |
| 79 | - $variables['controllerHandle'] = 'redirects'; |
|
| 79 | + $variables[ 'controllerHandle' ] = 'redirects'; |
|
| 80 | 80 | |
| 81 | 81 | // Basic variables |
| 82 | - $variables['fullPageForm'] = false; |
|
| 83 | - $variables['docsUrl'] = self::DOCUMENTATION_URL; |
|
| 84 | - $variables['pluginName'] = $pluginName; |
|
| 85 | - $variables['title'] = $templateTitle; |
|
| 86 | - $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : ''; |
|
| 87 | - $variables['crumbs'] = [ |
|
| 82 | + $variables[ 'fullPageForm' ] = false; |
|
| 83 | + $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL; |
|
| 84 | + $variables[ 'pluginName' ] = $pluginName; |
|
| 85 | + $variables[ 'title' ] = $templateTitle; |
|
| 86 | + $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : ''; |
|
| 87 | + $variables[ 'crumbs' ] = [ |
|
| 88 | 88 | [ |
| 89 | 89 | 'label' => $pluginName, |
| 90 | 90 | 'url' => UrlHelper::cpUrl('retour'), |
| 91 | 91 | ], |
| 92 | 92 | [ |
| 93 | 93 | 'label' => $templateTitle, |
| 94 | - 'url' => UrlHelper::cpUrl('retour/redirects'.$siteHandleUri), |
|
| 94 | + 'url' => UrlHelper::cpUrl('retour/redirects' . $siteHandleUri), |
|
| 95 | 95 | ], |
| 96 | 96 | ]; |
| 97 | - $variables['docTitle'] = "{$pluginName} - {$templateTitle}"; |
|
| 98 | - $variables['selectedSubnavItem'] = 'redirects'; |
|
| 97 | + $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}"; |
|
| 98 | + $variables[ 'selectedSubnavItem' ] = 'redirects'; |
|
| 99 | 99 | |
| 100 | 100 | // Render the template |
| 101 | 101 | return $this->renderTemplate('retour/redirects/index', $variables); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | int $siteId = 0, |
| 120 | 120 | StaticRedirectsModel $redirect = null |
| 121 | 121 | ): Response { |
| 122 | - $variables = []; |
|
| 122 | + $variables = [ ]; |
|
| 123 | 123 | PermissionHelper::controllerPermissionCheck('retour:redirects'); |
| 124 | 124 | |
| 125 | 125 | // Load in the redirect |
@@ -133,12 +133,12 @@ discard block |
||
| 133 | 133 | if ($redirect === null) { |
| 134 | 134 | $redirectConfig = Retour::$plugin->redirects->getRedirectById($redirectId); |
| 135 | 135 | if ($redirectConfig === null) { |
| 136 | - $redirectConfig = []; |
|
| 136 | + $redirectConfig = [ ]; |
|
| 137 | 137 | Craft::error( |
| 138 | 138 | Craft::t( |
| 139 | 139 | 'retour', |
| 140 | 140 | "Couldn't load redirect id {id}", |
| 141 | - ['id' => $redirectId] |
|
| 141 | + [ 'id' => $redirectId ] |
|
| 142 | 142 | ), |
| 143 | 143 | __METHOD__ |
| 144 | 144 | ); |
@@ -151,13 +151,13 @@ discard block |
||
| 151 | 151 | if ($redirect->siteId) { |
| 152 | 152 | $site = $sites->getSiteById($redirect->siteId); |
| 153 | 153 | if ($site) { |
| 154 | - MultiSiteHelper::requirePermission('editSite:'.$site->uid); |
|
| 154 | + MultiSiteHelper::requirePermission('editSite:' . $site->uid); |
|
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | if ($siteId) { |
| 158 | 158 | $site = $sites->getSiteById($siteId); |
| 159 | 159 | if ($site) { |
| 160 | - MultiSiteHelper::requirePermission('editSite:'.$site->uid); |
|
| 160 | + MultiSiteHelper::requirePermission('editSite:' . $site->uid); |
|
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | $pluginName = Retour::$settings->pluginName; |
@@ -169,20 +169,20 @@ discard block |
||
| 169 | 169 | } catch (InvalidConfigException $e) { |
| 170 | 170 | Craft::error($e->getMessage(), __METHOD__); |
| 171 | 171 | } |
| 172 | - $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl( |
|
| 172 | + $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl( |
|
| 173 | 173 | '@nystudio107/retour/assetbundles/retour/dist', |
| 174 | 174 | true |
| 175 | 175 | ); |
| 176 | 176 | // Sites menu |
| 177 | 177 | MultiSiteHelper::setSitesMenuVariables($variables); |
| 178 | - $variables['controllerHandle'] = 'redirects'; |
|
| 178 | + $variables[ 'controllerHandle' ] = 'redirects'; |
|
| 179 | 179 | |
| 180 | 180 | // Basic variables |
| 181 | - $variables['fullPageForm'] = true; |
|
| 182 | - $variables['docsUrl'] = self::DOCUMENTATION_URL; |
|
| 183 | - $variables['pluginName'] = $pluginName; |
|
| 184 | - $variables['title'] = $templateTitle; |
|
| 185 | - $variables['crumbs'] = [ |
|
| 181 | + $variables[ 'fullPageForm' ] = true; |
|
| 182 | + $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL; |
|
| 183 | + $variables[ 'pluginName' ] = $pluginName; |
|
| 184 | + $variables[ 'title' ] = $templateTitle; |
|
| 185 | + $variables[ 'crumbs' ] = [ |
|
| 186 | 186 | [ |
| 187 | 187 | 'label' => $pluginName, |
| 188 | 188 | 'url' => UrlHelper::cpUrl('retour'), |
@@ -193,12 +193,12 @@ discard block |
||
| 193 | 193 | ], |
| 194 | 194 | [ |
| 195 | 195 | 'label' => $templateTitle, |
| 196 | - 'url' => UrlHelper::cpUrl('retour/edit-redirect/'.$redirectId), |
|
| 196 | + 'url' => UrlHelper::cpUrl('retour/edit-redirect/' . $redirectId), |
|
| 197 | 197 | ], |
| 198 | 198 | ]; |
| 199 | - $variables['docTitle'] = "{$pluginName} - Redirects - {$templateTitle}"; |
|
| 200 | - $variables['selectedSubnavItem'] = 'redirects'; |
|
| 201 | - $variables['redirect'] = $redirect; |
|
| 199 | + $variables[ 'docTitle' ] = "{$pluginName} - Redirects - {$templateTitle}"; |
|
| 200 | + $variables[ 'selectedSubnavItem' ] = 'redirects'; |
|
| 201 | + $variables[ 'redirect' ] = $redirect; |
|
| 202 | 202 | |
| 203 | 203 | // Render the template |
| 204 | 204 | return $this->renderTemplate('retour/redirects/_edit', $variables); |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | if ($redirectConfig === null) { |
| 245 | 245 | throw new NotFoundHttpException('Redirect not found'); |
| 246 | 246 | } |
| 247 | - $redirectConfig['id'] = (int)$redirectConfig['id']; |
|
| 247 | + $redirectConfig[ 'id' ] = (int) $redirectConfig[ 'id' ]; |
|
| 248 | 248 | $redirect = new StaticRedirectsModel($redirectConfig); |
| 249 | 249 | // Make sure the redirect validates |
| 250 | 250 | if (!$redirect->validate()) { |
@@ -261,8 +261,8 @@ discard block |
||
| 261 | 261 | Retour::$plugin->redirects->saveRedirect($redirectConfig); |
| 262 | 262 | // Handle the case where the redirect wasn't saved because it'd create a redirect loop |
| 263 | 263 | $testRedirectConfig = Retour::$plugin->redirects->getRedirectByRedirectSrcUrl( |
| 264 | - $redirectConfig['redirectSrcUrl'], |
|
| 265 | - $redirectConfig['siteId'] |
|
| 264 | + $redirectConfig[ 'redirectSrcUrl' ], |
|
| 265 | + $redirectConfig[ 'siteId' ] |
|
| 266 | 266 | ); |
| 267 | 267 | if ($testRedirectConfig === null) { |
| 268 | 268 | Craft::$app->getSession()->setError(Craft::t('app', "Couldn't save redirect settings because it'd create a redirect loop.")); |
@@ -104,8 +104,8 @@ discard block |
||
| 104 | 104 | public function rules() |
| 105 | 105 | { |
| 106 | 106 | return [ |
| 107 | - ['pluginName', 'string'], |
|
| 108 | - ['pluginName', 'default', 'value' => 'Retour'], |
|
| 107 | + [ 'pluginName', 'string' ], |
|
| 108 | + [ 'pluginName', 'default', 'value' => 'Retour' ], |
|
| 109 | 109 | [ |
| 110 | 110 | [ |
| 111 | 111 | 'createUriChangeRedirects', |
@@ -116,17 +116,17 @@ discard block |
||
| 116 | 116 | ], |
| 117 | 117 | 'boolean' |
| 118 | 118 | ], |
| 119 | - ['staticRedirectDisplayLimit', 'integer', 'min' => 1], |
|
| 120 | - ['staticRedirectDisplayLimit', 'default', 'value' => 100], |
|
| 121 | - ['dynamicRedirectDisplayLimit', 'integer', 'min' => 1], |
|
| 122 | - ['dynamicRedirectDisplayLimit', 'default', 'value' => 100], |
|
| 123 | - ['statsStoredLimit', 'integer', 'min' => 1], |
|
| 124 | - ['statsStoredLimit', 'default', 'value' => 1000], |
|
| 125 | - ['refreshIntervalSecs', 'integer', 'min' => 0], |
|
| 126 | - ['refreshIntervalSecs', 'default', 'value' => 3], |
|
| 127 | - ['statsDisplayLimit', 'integer', 'min' => 1], |
|
| 128 | - ['statsDisplayLimit', 'default', 'value' => 1000], |
|
| 129 | - ['excludePatterns', ArrayValidator::class], |
|
| 119 | + [ 'staticRedirectDisplayLimit', 'integer', 'min' => 1 ], |
|
| 120 | + [ 'staticRedirectDisplayLimit', 'default', 'value' => 100 ], |
|
| 121 | + [ 'dynamicRedirectDisplayLimit', 'integer', 'min' => 1 ], |
|
| 122 | + [ 'dynamicRedirectDisplayLimit', 'default', 'value' => 100 ], |
|
| 123 | + [ 'statsStoredLimit', 'integer', 'min' => 1 ], |
|
| 124 | + [ 'statsStoredLimit', 'default', 'value' => 1000 ], |
|
| 125 | + [ 'refreshIntervalSecs', 'integer', 'min' => 0 ], |
|
| 126 | + [ 'refreshIntervalSecs', 'default', 'value' => 3 ], |
|
| 127 | + [ 'statsDisplayLimit', 'integer', 'min' => 1 ], |
|
| 128 | + [ 'statsDisplayLimit', 'default', 'value' => 1000 ], |
|
| 129 | + [ 'excludePatterns', ArrayValidator::class ], |
|
| 130 | 130 | ]; |
| 131 | 131 | } |
| 132 | 132 | |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | public function behaviors() |
| 137 | 137 | { |
| 138 | - $craft31Behaviors = []; |
|
| 138 | + $craft31Behaviors = [ ]; |
|
| 139 | 139 | if (Retour::$craft31) { |
| 140 | 140 | $craft31Behaviors = [ |
| 141 | 141 | 'parser' => [ |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | // Protected Properties |
| 41 | 41 | // ========================================================================= |
| 42 | 42 | |
| 43 | - protected $allowAnonymous = []; |
|
| 43 | + protected $allowAnonymous = [ ]; |
|
| 44 | 44 | |
| 45 | 45 | // Public Methods |
| 46 | 46 | // ========================================================================= |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function actionDashboard(string $siteHandle = null, bool $showWelcome = false): Response |
| 58 | 58 | { |
| 59 | - $variables = []; |
|
| 59 | + $variables = [ ]; |
|
| 60 | 60 | PermissionHelper::controllerPermissionCheck('retour:dashboard'); |
| 61 | 61 | // Trim the statistics |
| 62 | 62 | Retour::$plugin->statistics->trimStatistics(); |
@@ -71,34 +71,34 @@ discard block |
||
| 71 | 71 | } catch (InvalidConfigException $e) { |
| 72 | 72 | Craft::error($e->getMessage(), __METHOD__); |
| 73 | 73 | } |
| 74 | - $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl( |
|
| 74 | + $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl( |
|
| 75 | 75 | '@nystudio107/retour/assetbundles/retour/dist', |
| 76 | 76 | true |
| 77 | 77 | ); |
| 78 | 78 | // Enabled sites |
| 79 | 79 | MultiSiteHelper::setMultiSiteVariables($siteHandle, $siteId, $variables); |
| 80 | - $variables['controllerHandle'] = 'dashboard'; |
|
| 80 | + $variables[ 'controllerHandle' ] = 'dashboard'; |
|
| 81 | 81 | |
| 82 | 82 | // Basic variables |
| 83 | - $variables['fullPageForm'] = false; |
|
| 84 | - $variables['docsUrl'] = self::DOCUMENTATION_URL; |
|
| 85 | - $variables['pluginName'] = $pluginName; |
|
| 86 | - $variables['title'] = $templateTitle; |
|
| 87 | - $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : ''; |
|
| 88 | - $variables['crumbs'] = [ |
|
| 83 | + $variables[ 'fullPageForm' ] = false; |
|
| 84 | + $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL; |
|
| 85 | + $variables[ 'pluginName' ] = $pluginName; |
|
| 86 | + $variables[ 'title' ] = $templateTitle; |
|
| 87 | + $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : ''; |
|
| 88 | + $variables[ 'crumbs' ] = [ |
|
| 89 | 89 | [ |
| 90 | 90 | 'label' => $pluginName, |
| 91 | 91 | 'url' => UrlHelper::cpUrl('retour'), |
| 92 | 92 | ], |
| 93 | 93 | [ |
| 94 | 94 | 'label' => $templateTitle, |
| 95 | - 'url' => UrlHelper::cpUrl('retour/dashboard'.$siteHandleUri), |
|
| 95 | + 'url' => UrlHelper::cpUrl('retour/dashboard' . $siteHandleUri), |
|
| 96 | 96 | ], |
| 97 | 97 | ]; |
| 98 | - $variables['docTitle'] = "{$pluginName} - {$templateTitle}"; |
|
| 99 | - $variables['selectedSubnavItem'] = 'dashboard'; |
|
| 100 | - $variables['showWelcome'] = $showWelcome; |
|
| 101 | - $variables['settings'] = Retour::$settings; |
|
| 98 | + $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}"; |
|
| 99 | + $variables[ 'selectedSubnavItem' ] = 'dashboard'; |
|
| 100 | + $variables[ 'showWelcome' ] = $showWelcome; |
|
| 101 | + $variables[ 'settings' ] = Retour::$settings; |
|
| 102 | 102 | |
| 103 | 103 | // Render the template |
| 104 | 104 | return $this->renderTemplate('retour/dashboard/index', $variables); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | Craft::t( |
| 117 | 117 | 'retour', |
| 118 | 118 | 'Retour statistics cleared: {error}', |
| 119 | - ['error' => $error] |
|
| 119 | + [ 'error' => $error ] |
|
| 120 | 120 | ), |
| 121 | 121 | __METHOD__ |
| 122 | 122 | ); |