nystudio107 / craft-retour

src/models/DbModel.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     {
         foreach ($config as $propName => $propValue) {
             if (!property_exists($class, $propName)) {
-                unset($config[$propName]);
+                unset($config[ $propName ]);
             }
         }
     }
@@ -47,7 +47,7 @@ 
     /**
      * @inheritdoc
      */
-    public function __construct(array $config = [])
+    public function __construct(array $config = [ ])
     {
         // Unset any deprecated properties
         self::cleanProperties(static::class, $config);

src/helpers/Text.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 
         if (!empty($string)) {
             $string = strip_tags($string);
-            $result = (string)Stringy::create($string)->truncate($length, $substring);
+            $result = (string) Stringy::create($string)->truncate($length, $substring);
         }
 
         return $result;
@@ -67,7 +67,7 @@ 
 
         if (!empty($string)) {
             $string = strip_tags($string);
-            $result = (string)Stringy::create($string)->safeTruncate($length, $substring);
+            $result = (string) Stringy::create($string)->safeTruncate($length, $substring);
         }
 
         return $result;

src/widgets/RetourWidget.php

Spacing +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
         $rules = array_merge(
             $rules,
             [
-                ['numberOfDays', 'integer', 'min' => 1],
-                ['numberOfDays', 'default', 'value' => 30],
+                [ 'numberOfDays', 'integer', 'min' => 1 ],
+                [ 'numberOfDays', 'default', 'value' => 30 ],
             ]
         );
         return $rules;

src/controllers/SettingsController.php

Spacing +12 added lines, -12 removed lines

@@ -39,7 +39,7 @@ 
     // Protected Properties
     // =========================================================================
 
-    protected $allowAnonymous = [];
+    protected $allowAnonymous = [ ];
 
     // Public Methods
     // =========================================================================
@@ -54,7 +54,7 @@ 
      */
     public function actionPluginSettings($settings = null): Response
     {
-        $variables = [];
+        $variables = [ ];
         PermissionHelper::controllerPermissionCheck('retour:settings');
         if ($settings === null) {
             $settings = Retour::$settings;
@@ -69,16 +69,16 @@ 
         } catch (InvalidConfigException $e) {
             Craft::error($e->getMessage(), __METHOD__);
         }
-        $variables['baseAssetsUrl'] = Craft::$app->assetManager->getPublishedUrl(
+        $variables[ 'baseAssetsUrl' ] = Craft::$app->assetManager->getPublishedUrl(
             '@nystudio107/retour/assetbundles/retour/dist',
             true
         );
         // Basic variables
-        $variables['fullPageForm'] = true;
-        $variables['docsUrl'] = self::DOCUMENTATION_URL;
-        $variables['pluginName'] = $pluginName;
-        $variables['title'] = $templateTitle;
-        $variables['crumbs'] = [
+        $variables[ 'fullPageForm' ] = true;
+        $variables[ 'docsUrl' ] = self::DOCUMENTATION_URL;
+        $variables[ 'pluginName' ] = $pluginName;
+        $variables[ 'title' ] = $templateTitle;
+        $variables[ 'crumbs' ] = [
             [
                 'label' => $pluginName,
                 'url' => UrlHelper::cpUrl('retour'),
@@ -88,9 +88,9 @@ 
                 'url' => UrlHelper::cpUrl('retour/settings'),
             ],
         ];
-        $variables['docTitle'] = "{$pluginName} - {$templateTitle}";
-        $variables['selectedSubnavItem'] = 'settings';
-        $variables['settings'] = $settings;
+        $variables[ 'docTitle' ] = "{$pluginName} - {$templateTitle}";
+        $variables[ 'selectedSubnavItem' ] = 'settings';
+        $variables[ 'settings' ] = $settings;
 
         // Render the template
         return $this->renderTemplate('retour/settings', $variables);
@@ -110,7 +110,7 @@ 
         PermissionHelper::controllerPermissionCheck('retour:settings');
         $this->requirePostRequest();
         $pluginHandle = Craft::$app->getRequest()->getRequiredBodyParam('pluginHandle');
-        $settings = Craft::$app->getRequest()->getBodyParam('settings', []);
+        $settings = Craft::$app->getRequest()->getBodyParam('settings', [ ]);
         $plugin = Craft::$app->getPlugins()->getPlugin($pluginHandle);
 
         if ($plugin === null) {

src/validators/UriValidator.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             return;
         }
         // Make sure there is a leading /
-        $value = '/'.ltrim($value, '/');
+        $value = '/' . ltrim($value, '/');
         $model->$attribute = $value;
     }
 }

src/Retour.php

Spacing +30 added lines, -30 removed lines

@@ -89,7 +89,7 @@ 
     /**
      * @var array The URIs for the element before it was saved
      */
-    public $oldElementUris = [];
+    public $oldElementUris = [ ];
 
     // Public Methods
     // =========================================================================
@@ -114,7 +114,7 @@ 
             Craft::t(
                 'retour',
                 '{name} plugin loaded',
-                ['name' => $this->name]
+                [ 'name' => $this->name ]
             ),
             __METHOD__
         );
@@ -134,24 +134,24 @@ 
      */
     public function getCpNavItem()
     {
-        $subNavs = [];
+        $subNavs = [ ];
         $navItem = parent::getCpNavItem();
         $currentUser = Craft::$app->getUser()->getIdentity();
         // Only show sub-navs the user has permission to view
         if ($currentUser->can('retour:dashboard')) {
-            $subNavs['dashboard'] = [
+            $subNavs[ 'dashboard' ] = [
                 'label' => 'Dashboard',
                 'url' => 'retour/dashboard',
             ];
         }
         if ($currentUser->can('retour:redirects')) {
-            $subNavs['redirects'] = [
+            $subNavs[ 'redirects' ] = [
                 'label' => 'Redirects',
                 'url' => 'retour/redirects',
             ];
         }
         if ($currentUser->can('retour:settings')) {
-            $subNavs['settings'] = [
+            $subNavs[ 'settings' ] = [
                 'label' => 'Settings',
                 'url' => 'retour/settings',
             ];
@@ -210,7 +210,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     // Invalidate our caches after we've been installed
                     $this->clearAllCaches();
@@ -237,7 +237,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('retour', RetourVariable::class);
@@ -247,7 +247,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_BEFORE_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_BEFORE_SAVE_ELEMENT',
                     __METHOD__
@@ -262,8 +262,8 @@ 
                         if ($oldElement !== null) {
                             // Stash the old URLs by element id, and do so only once,
                             // in case we are called more than once per request
-                            if (empty($this->oldElementUris[$oldElement->id])) {
-                                $this->oldElementUris[$oldElement->id] = $this->getAllElementUris($oldElement);
+                            if (empty($this->oldElementUris[ $oldElement->id ])) {
+                                $this->oldElementUris[ $oldElement->id ] = $this->getAllElementUris($oldElement);
                             }
                         }
                     }
@@ -274,7 +274,7 @@ 
         Event::on(
             Elements::class,
             Elements::EVENT_AFTER_SAVE_ELEMENT,
-            function (ElementEvent $event) {
+            function(ElementEvent $event) {
                 Craft::debug(
                     'Elements::EVENT_AFTER_SAVE_ELEMENT',
                     __METHOD__
@@ -290,7 +290,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            function () {
+            function() {
                 // Install these only after all other plugins have loaded
                 $request = Craft::$app->getRequest();
                 // Only respond to non-console site requests
@@ -314,7 +314,7 @@ 
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                     __METHOD__
@@ -337,15 +337,15 @@ 
         Event::on(
             Dashboard::class,
             Dashboard::EVENT_REGISTER_WIDGET_TYPES,
-            function (RegisterComponentTypesEvent $event) {
-                $event->types[] = RetourWidget::class;
+            function(RegisterComponentTypesEvent $event) {
+                $event->types[ ] = RetourWidget::class;
             }
         );
         // Handler: UrlManager::EVENT_REGISTER_CP_URL_RULES
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_CP_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_CP_URL_RULES',
                     __METHOD__
@@ -361,20 +361,20 @@ 
         Event::on(
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
-            function (RegisterUserPermissionsEvent $event) {
+            function(RegisterUserPermissionsEvent $event) {
                 Craft::debug(
                     'UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     __METHOD__
                 );
                 // Register our custom permissions
-                $event->permissions[Craft::t('retour', 'Retour')] = $this->customAdminCpPermissions();
+                $event->permissions[ Craft::t('retour', 'Retour') ] = $this->customAdminCpPermissions();
             }
         );
         // Handler: ClearCaches::EVENT_REGISTER_CACHE_OPTIONS
         Event::on(
             ClearCaches::class,
             ClearCaches::EVENT_REGISTER_CACHE_OPTIONS,
-            function (RegisterCacheOptionsEvent $event) {
+            function(RegisterCacheOptionsEvent $event) {
                 Craft::debug(
                     'ClearCaches::EVENT_REGISTER_CACHE_OPTIONS',
                     __METHOD__
@@ -399,7 +399,7 @@ 
         Event::on(
             ErrorHandler::class,
             ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION,
-            function (ExceptionEvent $event) {
+            function(ExceptionEvent $event) {
                 Craft::debug(
                     'ErrorHandler::EVENT_BEFORE_HANDLE_EXCEPTION',
                     __METHOD__
@@ -441,16 +441,16 @@ 
     protected function handleElementUriChange(Element $element)
     {
         $uris = $this->getAllElementUris($element);
-        if (!empty($this->oldElementUris[$element->id])) {
-            $oldElementUris = $this->oldElementUris[$element->id];
+        if (!empty($this->oldElementUris[ $element->id ])) {
+            $oldElementUris = $this->oldElementUris[ $element->id ];
             foreach ($uris as $siteId => $newUri) {
-                if (!empty($oldElementUris[$siteId])) {
-                    $oldUri = $oldElementUris[$siteId];
+                if (!empty($oldElementUris[ $siteId ])) {
+                    $oldUri = $oldElementUris[ $siteId ];
                     Craft::debug(
                         Craft::t(
                             'retour',
                             'Comparing old: {oldUri} to new: {newUri}',
-                            ['oldUri' => print_r($oldUri, true), 'newUri' => print_r($newUri, true)]
+                            [ 'oldUri' => print_r($oldUri, true), 'newUri' => print_r($newUri, true) ]
                         ),
                         __METHOD__
                     );
@@ -478,12 +478,12 @@ 
      */
     protected function getAllElementUris(Element $element): array
     {
-        $uris = [];
+        $uris = [ ];
         $sites = Craft::$app->getSites()->getAllSites();
         foreach ($sites as $site) {
             $uri = Craft::$app->getElements()->getElementUriForSite($element->id, $site->id);
             if ($uri !== null) {
-                $uris[$site->id] = $uri;
+                $uris[ $site->id ] = $uri;
             }
         }
 
@@ -491,7 +491,7 @@ 
             Craft::t(
                 'retour',
                 'Getting Element URIs: {uris}',
-                ['uris' => print_r($uris, true)]
+                [ 'uris' => print_r($uris, true) ]
             ),
             __METHOD__
         );
@@ -558,7 +558,7 @@ 
             [
                 'key' => 'retour-redirect-caches',
                 'label' => Craft::t('retour', 'Retour redirect caches'),
-                'action' => [self::$plugin->redirects, 'invalidateCaches'],
+                'action' => [ self::$plugin->redirects, 'invalidateCaches' ],
             ],
         ];
     }

src/console/controllers/StatsController.php

Spacing +3 added lines, -3 removed lines

@@ -66,13 +66,13 @@
      */
     public function actionTrim(): int
     {
-        echo Craft::t('retour', 'Trimming statistics').PHP_EOL;
+        echo Craft::t('retour', 'Trimming statistics') . PHP_EOL;
         $affectedRows = Retour::$plugin->statistics->trimStatistics($this->limit);
         echo Craft::t(
             'retour',
             'Trimmed {rows} from retour_stats table',
-            ['rows' => $affectedRows]
-        ).PHP_EOL;
+            [ 'rows' => $affectedRows ]
+        ) . PHP_EOL;
 
         return 0;
     }

src/helpers/Manifest.php

Spacing +29 added lines, -29 removed lines

@@ -64,12 +64,12 @@ 
         if ($legacyModule === null) {
             return '';
         }
-        $lines = [];
+        $lines = [ ];
         if ($async) {
-            $lines[] = "<link rel=\"preload\" href=\"{$legacyModule}\" as=\"style\" onload=\"this.onload=null;this.rel='stylesheet'\" />";
-            $lines[] = "<noscript><link rel=\"stylesheet\" href=\"{$legacyModule}\"></noscript>";
+            $lines[ ] = "<link rel=\"preload\" href=\"{$legacyModule}\" as=\"style\" onload=\"this.onload=null;this.rel='stylesheet'\" />";
+            $lines[ ] = "<noscript><link rel=\"stylesheet\" href=\"{$legacyModule}\"></noscript>";
         } else {
-            $lines[] = "<link rel=\"stylesheet\" href=\"{$legacyModule}\" />";
+            $lines[ ] = "<link rel=\"stylesheet\" href=\"{$legacyModule}\" />";
         }
 
         return implode("\r\n", $lines);
@@ -84,7 +84,7 @@ 
     {
         $result = self::getFile($path);
         if ($result) {
-            $result = "<style>\r\n".$result."</style>\r\n";
+            $result = "<style>\r\n" . $result . "</style>\r\n";
             return $result;
         }
 
@@ -127,12 +127,12 @@ 
                 return '';
             }
         }
-        $lines = [];
+        $lines = [ ];
         if ($async) {
-            $lines[] = "<script type=\"module\" src=\"{$modernModule}\"></script>";
-            $lines[] = "<script nomodule src=\"{$legacyModule}\"></script>";
+            $lines[ ] = "<script type=\"module\" src=\"{$modernModule}\"></script>";
+            $lines[ ] = "<script nomodule src=\"{$legacyModule}\"></script>";
         } else {
-            $lines[] = "<script src=\"{$legacyModule}\"></script>";
+            $lines[ ] = "<script src=\"{$legacyModule}\"></script>";
         }
 
         return implode("\r\n", $lines);
@@ -183,8 +183,8 @@ 
         $module = self::getModuleEntry($config, $moduleName, $type, $soft);
         if ($module !== null) {
             $prefix = self::$isHot
-                ? $config['devServer']['publicPath']
-                : $config['server']['publicPath'];
+                ? $config[ 'devServer' ][ 'publicPath' ]
+                : $config[ 'server' ][ 'publicPath' ];
             // If the module isn't a full URL, prefix it
             if (!UrlHelper::isAbsoluteUrl($module)) {
                 $module = self::combinePaths($prefix, $module);
@@ -225,16 +225,16 @@ 
         $manifest = self::getManifestFile($config, $type);
         if ($manifest !== null) {
             // Make sure it exists in the manifest
-            if (empty($manifest[$moduleName])) {
+            if (empty($manifest[ $moduleName ])) {
                 self::reportError(Craft::t(
                     'retour',
                     'Module does not exist in the manifest: {moduleName}',
-                    ['moduleName' => $moduleName]
+                    [ 'moduleName' => $moduleName ]
                 ), $soft);
 
                 return null;
             }
-            $module = $manifest[$moduleName];
+            $module = $manifest[ $moduleName ];
         }
 
         return $module;
@@ -254,14 +254,14 @@ 
         $manifest = null;
         // Determine whether we should use the devServer for HMR or not
         $devMode = Craft::$app->getConfig()->getGeneral()->devMode;
-        self::$isHot = ($devMode && $config['useDevServer']);
+        self::$isHot = ($devMode && $config[ 'useDevServer' ]);
         // Try to get the manifest
         while ($manifest === null) {
             $manifestPath = self::$isHot
-                ? $config['devServer']['manifestPath']
-                : $config['server']['manifestPath'];
+                ? $config[ 'devServer' ][ 'manifestPath' ]
+                : $config[ 'server' ][ 'manifestPath' ];
             // Normalize the path
-            $path = self::combinePaths($manifestPath, $config['manifest'][$type]);
+            $path = self::combinePaths($manifestPath, $config[ 'manifest' ][ $type ]);
             $manifest = self::getJsonFile($path);
             // If the manifest isn't found, and it was hot, fall back on non-hot
             if ($manifest === null) {
@@ -269,7 +269,7 @@ 
                 self::reportError(Craft::t(
                     'retour',
                     'Manifest file not found at: {manifestPath}',
-                    ['manifestPath' => $manifestPath]
+                    [ 'manifestPath' => $manifestPath ]
                 ), true);
                 if (self::$isHot) {
                     // Try again, but not with home module replacement
@@ -312,7 +312,7 @@ 
         }
         if ($path !== null) {
             $path = self::combinePaths(
-                $config['localFiles']['basePath'],
+                $config[ 'localFiles' ][ 'basePath' ],
                 $path
             );
 
@@ -331,7 +331,7 @@ 
      */
     protected static function getJsonFile(string $path)
     {
-        return self::getFileFromUri($path, [self::class, 'jsonFileDecode']);
+        return self::getFileFromUri($path, [ self::class, 'jsonFileDecode' ]);
     }
 
     /**
@@ -385,14 +385,14 @@ 
     protected static function getFileContents(string $path, callable $callback = null)
     {
         // Return the memoized manifest if it exists
-        if (!empty(self::$files[$path])) {
-            return self::$files[$path];
+        if (!empty(self::$files[ $path ])) {
+            return self::$files[ $path ];
         }
         // Create the dependency tags
         $dependency = new TagDependency([
             'tags' => [
                 self::CACHE_TAG,
-                self::CACHE_TAG.$path,
+                self::CACHE_TAG . $path,
             ],
         ]);
         // Set the cache duration based on devMode
@@ -402,8 +402,8 @@ 
         // Get the result from the cache, or parse the file
         $cache = Craft::$app->getCache();
         $file = $cache->getOrSet(
-            self::CACHE_KEY.$path,
-            function () use ($path, $callback) {
+            self::CACHE_KEY . $path,
+            function() use ($path, $callback) {
                 $result = null;
                 $contents = @file_get_contents($path);
                 if ($contents) {
@@ -418,7 +418,7 @@ 
             $cacheDuration,
             $dependency
         );
-        self::$files[$path] = $file;
+        self::$files[ $path ] = $file;
 
         return $file;
     }
@@ -433,7 +433,7 @@ 
     protected static function combinePaths(string ...$paths): string
     {
         $last_key = \count($paths) - 1;
-        array_walk($paths, function (&$val, $key) use ($last_key) {
+        array_walk($paths, function(&$val, $key) use ($last_key) {
             switch ($key) {
                 case 0:
                     $val = rtrim($val, '/ ');
@@ -451,7 +451,7 @@ 
         $last = array_pop($paths);
         $paths = array_filter($paths);
         array_unshift($paths, $first);
-        $paths[] = $last;
+        $paths[ ] = $last;
 
         return implode('/', $paths);
     }

src/models/Settings.php

Spacing +10 added lines, -10 removed lines

@@ -89,8 +89,8 @@ 
     public function rules()
     {
         return [
-            ['pluginName', 'string'],
-            ['pluginName', 'default', 'value' => 'Retour'],
+            [ 'pluginName', 'string' ],
+            [ 'pluginName', 'default', 'value' => 'Retour' ],
             [
                 [
                     'createUriChangeRedirects',
@@ -101,14 +101,14 @@ 
                 ],
                 'boolean'
             ],
-            ['staticRedirectDisplayLimit', 'integer', 'min' => 1],
-            ['staticRedirectDisplayLimit', 'default', 'value' => 100],
-            ['dynamicRedirectDisplayLimit', 'integer', 'min' => 1],
-            ['dynamicRedirectDisplayLimit', 'default', 'value' => 100],
-            ['statsStoredLimit', 'integer', 'min' => 1],
-            ['statsStoredLimit', 'default', 'value' => 1000],
-            ['statsDisplayLimit', 'integer', 'min' => 1],
-            ['statsDisplayLimit', 'default', 'value' => 1000],
+            [ 'staticRedirectDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'staticRedirectDisplayLimit', 'default', 'value' => 100 ],
+            [ 'dynamicRedirectDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'dynamicRedirectDisplayLimit', 'default', 'value' => 100 ],
+            [ 'statsStoredLimit', 'integer', 'min' => 1 ],
+            [ 'statsStoredLimit', 'default', 'value' => 1000 ],
+            [ 'statsDisplayLimit', 'integer', 'min' => 1 ],
+            [ 'statsDisplayLimit', 'default', 'value' => 1000 ],
         ];
     }