nystudio107 / craft-retour

src/helpers/MultiSite.php

Spacing +24 added lines, -24 removed lines

@@ -36,7 +36,7 @@ 
     public static function setSitesMenuVariables(array &$variables)
     {
         // Set defaults based on the section settings
-        $variables['sitesMenu'] = [
+        $variables[ 'sitesMenu' ] = [
             0 => Craft::t(
                 'retour',
                 'All Sites'
@@ -49,11 +49,11 @@ 
             /** @var Site $site */
             foreach ($sites->getAllGroups() as $group) {
                 $groupSites = $sites->getSitesByGroupId($group->id);
-                $variables['sitesMenu'][$group->name]
-                    = ['optgroup' => $group->name];
+                $variables[ 'sitesMenu' ][ $group->name ]
+                    = [ 'optgroup' => $group->name ];
                 foreach ($groupSites as $groupSite) {
                     if (in_array($groupSite->id, $editableSites, false)) {
-                        $variables['sitesMenu'][$groupSite->id] = $groupSite->name;
+                        $variables[ 'sitesMenu' ][ $groupSite->id ] = $groupSite->name;
                     }
                 }
             }
@@ -73,53 +73,53 @@ 
         $sites = Craft::$app->getSites();
         if (Craft::$app->getIsMultiSite()) {
             // Set defaults based on the section settings
-            $variables['enabledSiteIds'] = [];
-            $variables['siteIds'] = [];
+            $variables[ 'enabledSiteIds' ] = [ ];
+            $variables[ 'siteIds' ] = [ ];
 
             /** @var Site $site */
             foreach ($sites->getEditableSiteIds() as $editableSiteId) {
-                $variables['enabledSiteIds'][] = $editableSiteId;
-                $variables['siteIds'][] = $editableSiteId;
+                $variables[ 'enabledSiteIds' ][ ] = $editableSiteId;
+                $variables[ 'siteIds' ][ ] = $editableSiteId;
             }
 
             // Make sure the $siteId they are trying to edit is in our array of editable sites
-            if (!\in_array($siteId, $variables['enabledSiteIds'], false)) {
-                if (!empty($variables['enabledSiteIds'])) {
+            if (!\in_array($siteId, $variables[ 'enabledSiteIds' ], false)) {
+                if (!empty($variables[ 'enabledSiteIds' ])) {
                     if ($siteId !== 0) {
-                        $siteId = reset($variables['enabledSiteIds']);
+                        $siteId = reset($variables[ 'enabledSiteIds' ]);
                     }
                 } else {
-                    self::requirePermission('editSite:'.$siteId);
+                    self::requirePermission('editSite:' . $siteId);
                 }
             }
         }
         // Set the currentSiteId and currentSiteHandle
-        $variables['currentSiteId'] = empty($siteId) ? 0 : $siteId;
-        $variables['currentSiteHandle'] = empty($siteHandle)
+        $variables[ 'currentSiteId' ] = empty($siteId) ? 0 : $siteId;
+        $variables[ 'currentSiteHandle' ] = empty($siteHandle)
             ? Craft::$app->getSites()->currentSite->handle
             : $siteHandle;
 
         // Page title
-        $variables['showSites'] = (
+        $variables[ 'showSites' ] = (
             Craft::$app->getIsMultiSite() &&
-            \count($variables['enabledSiteIds'])
+            \count($variables[ 'enabledSiteIds' ])
         );
 
-        if ($variables['showSites']) {
-            if ($variables['currentSiteId'] === 0) {
-                $variables['sitesMenuLabel'] = Craft::t(
+        if ($variables[ 'showSites' ]) {
+            if ($variables[ 'currentSiteId' ] === 0) {
+                $variables[ 'sitesMenuLabel' ] = Craft::t(
                     'retour',
                     'All Sites'
                 );
             } else {
-                $variables['sitesMenuLabel'] = Craft::t(
+                $variables[ 'sitesMenuLabel' ] = Craft::t(
                     'site',
-                    $sites->getSiteById((int)$variables['currentSiteId'])->name
+                    $sites->getSiteById((int) $variables[ 'currentSiteId' ])->name
                 );
             }
         } else {
-            $variables['currentSiteId'] = 0;
-            $variables['sitesMenuLabel'] = '';
+            $variables[ 'currentSiteId' ] = 0;
+            $variables[ 'sitesMenuLabel' ] = '';
         }
     }
 
@@ -137,7 +137,7 @@ 
         if ($siteHandle !== null) {
             $site = Craft::$app->getSites()->getSiteByHandle($siteHandle);
             if (!$site) {
-                throw new NotFoundHttpException('Invalid site handle: '.$siteHandle);
+                throw new NotFoundHttpException('Invalid site handle: ' . $siteHandle);
             }
             $siteId = $site->id;
         } else {

src/migrations/m190416_212500_widget_type_update.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         // Update retour widget type
         $this->update('{{%widgets}}', [
             'type' => RetourWidget::class
-        ], ['type' => 'Retour']);
+        ], [ 'type' => 'Retour' ]);
 
         return true;
     }

src/migrations/Install.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         // Update retour widget type
         $this->update('{{%widgets}}', [
             'type' => RetourWidget::class
-        ], ['type' => 'Retour']);
+        ], [ 'type' => 'Retour' ]);
 
         return true;
     }

src/services/Statistics.php

Spacing +18 added lines, -18 removed lines

@@ -60,7 +60,7 @@ 
         }
         // Query the db table
         $stats = (new Query())
-            ->from(['{{%retour_stats}}'])
+            ->from([ '{{%retour_stats}}' ])
             ->orderBy('hitCount DESC')
             ->limit(Retour::$settings->statsDisplayLimit)
             ->all();
@@ -79,13 +79,13 @@ 
     public function getRecentStatistics($days = 1, $handled = false): array
     {
         // Ensure is an int
-        $handledInt = (int)$handled;
-        $stats = [];
+        $handledInt = (int) $handled;
+        $stats = [ ];
         $db = Craft::$app->getDb();
         if ($db->getIsMysql()) {
             // Query the db table
             $stats = (new Query())
-                ->from(['{{%retour_stats}}'])
+                ->from([ '{{%retour_stats}}' ])
                 ->where("hitLastTime >= ( CURDATE() - INTERVAL '{$days}' DAY )")
                 ->andWhere("handledByRetour = {$handledInt}")
                 ->orderBy('hitLastTime DESC')
@@ -94,9 +94,9 @@ 
         if ($db->getIsPgsql()) {
             // Query the db table
             $stats = (new Query())
-                ->from(['{{%retour_stats}}'])
+                ->from([ '{{%retour_stats}}' ])
                 ->where("\"hitLastTime\" >= ( CURRENT_TIMESTAMP - INTERVAL '{$days} days' )")
-                ->andWhere(['handledByRetour' => $handledInt])
+                ->andWhere([ 'handledByRetour' => $handledInt ])
                 ->orderBy('hitLastTime DESC')
                 ->all();
         }
@@ -163,16 +163,16 @@ 
         $stats->validate();
         // Find any existing retour_stats record
         $statsConfig = (new Query())
-            ->from(['{{%retour_stats}}'])
-            ->where(['redirectSrcUrl' => $stats->redirectSrcUrl])
+            ->from([ '{{%retour_stats}}' ])
+            ->where([ 'redirectSrcUrl' => $stats->redirectSrcUrl ])
             ->one();
         // If no record is found, initialize some values
         if ($statsConfig === null) {
             $stats->id = 0;
             $stats->hitCount = 0;
         } else {
-            $stats->id = $statsConfig['id'];
-            $stats->hitCount = $statsConfig['hitCount'];
+            $stats->id = $statsConfig[ 'id' ];
+            $stats->hitCount = $statsConfig[ 'hitCount' ];
         }
         // Merge in the updated info
         $stats->siteId = $siteId;
@@ -181,9 +181,9 @@ 
         $stats->userAgent = $userAgent;
         $stats->exceptionMessage = $exceptionMessage;
         $stats->exceptionFilePath = $exceptionFilePath;
-        $stats->exceptionFileLine = (int)$exceptionFileLine;
+        $stats->exceptionFileLine = (int) $exceptionFileLine;
         $stats->hitLastTime = Db::prepareDateForDb(new \DateTime());
-        $stats->handledByRetour = (int)$handled;
+        $stats->handledByRetour = (int) $handled;
         $stats->hitCount++;
         $statsConfig = $stats->getAttributes();
         // Record the updated statistics
@@ -253,7 +253,7 @@ 
                 Craft::t(
                     'retour',
                     'Trimmed {rows} from retour_stats table',
-                    ['rows' => $affectedRows]
+                    [ 'rows' => $affectedRows ]
                 ),
                 __METHOD__
             );
@@ -274,7 +274,7 @@ 
                 Craft::t(
                     'retour',
                     'Error validating statistics {id}: {errors}',
-                    ['id' => $stats->id, 'errors' => print_r($stats->getErrors(), true)]
+                    [ 'id' => $stats->id, 'errors' => print_r($stats->getErrors(), true) ]
                 ),
                 __METHOD__
             );
@@ -284,14 +284,14 @@ 
         // Get the validated model attributes and save them to the db
         $statsConfig = $stats->getAttributes();
         $db = Craft::$app->getDb();
-        if ($statsConfig['id'] !== 0) {
+        if ($statsConfig[ 'id' ] !== 0) {
             // Update the existing record
             try {
                 $result = $db->createCommand()->update(
                     '{{%retour_stats}}',
                     $statsConfig,
                     [
-                        'id' => $statsConfig['id'],
+                        'id' => $statsConfig[ 'id' ],
                     ]
                 )->execute();
             } catch (Exception $e) {
@@ -300,7 +300,7 @@ 
                 // Craft::error($e->getMessage(), __METHOD__);
             }
         } else {
-            unset($statsConfig['id']);
+            unset($statsConfig[ 'id' ]);
             // Create a new record
             try {
                 $db->createCommand()->insert(
@@ -327,7 +327,7 @@ 
         $now = round(microtime(true) * 1000);
         $cache = Craft::$app->getCache();
         $then = $cache->get(self::LAST_STATISTICS_TRIM_CACHE_KEY);
-        if (($then !== false) && ($now - (int)$then < Retour::$settings->statisticsRateLimitMs)) {
+        if (($then !== false) && ($now - (int) $then < Retour::$settings->statisticsRateLimitMs)) {
             $limited = true;
         }
         $cache->set(self::LAST_STATISTICS_TRIM_CACHE_KEY, $now, 0);

src/listeners/GetCraftQLSchema.php

Spacing +13 added lines, -13 removed lines

@@ -62,36 +62,36 @@ 
                 // Boolean field
                 $retourField
                     ->addBooleanField($field)
-                    ->resolve(function ($redirect) use ($field) {
-                        $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (bool)$result;
+                    ->resolve(function($redirect) use ($field) {
+                        $result = $redirect[ $field ] ?? null;
+                        return $result === null ? $result : (bool) $result;
                     });
             } elseif (in_array($field, self::INT_FIELDS, true)) {
                 // Integer field
                 $retourField
                     ->addIntField($field)
-                    ->resolve(function ($redirect) use ($field) {
-                        $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (int)$result;
+                    ->resolve(function($redirect) use ($field) {
+                        $result = $redirect[ $field ] ?? null;
+                        return $result === null ? $result : (int) $result;
                     });
             } else {
                 // String field
                 $retourField
                     ->addStringField($field)
-                    ->resolve(function ($redirect) use ($field) {
-                        $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (string)$result;
+                    ->resolve(function($redirect) use ($field) {
+                        $result = $redirect[ $field ] ?? null;
+                        return $result === null ? $result : (string) $result;
                     });
             }
         }
         // Add the root
         $event->schema->addField('retour')
-            ->arguments(function (FieldBuilder $field) {
+            ->arguments(function(FieldBuilder $field) {
                 $field->addStringArgument('uri');
                 $field->addIntArgument('siteId');
             })
             ->type($retourField)
-            ->resolve(function ($root, $args, $context, $info) {
+            ->resolve(function($root, $args, $context, $info) {
                 // If our root is an Element, extract the URI and siteId from it
                 if ($root instanceof Element) {
                     /** Element $root */
@@ -99,8 +99,8 @@ 
                     $siteId = $root->siteId;
                 } else {
                     // Otherwise use the passed in arguments, or defaults
-                    $uri = $args['uri'] ?? '/';
-                    $siteId = $args['siteId'] ?? null;
+                    $uri = $args[ 'uri' ] ?? '/';
+                    $siteId = $args[ 'siteId' ] ?? null;
                 }
                 $uri = trim($uri === '/' ? '__home__' : $uri);
 

src/gql/types/RetourType.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      */
     public function __construct(array $config)
     {
-        $config['interfaces'] = [
+        $config[ 'interfaces' ] = [
             RetourInterface::getType(),
         ];
 
@@ -45,6 +45,6 @@ 
     {
         $fieldName = $resolveInfo->fieldName;
 
-        return $source[$fieldName];
+        return $source[ $fieldName ];
     }
 }

src/gql/resolvers/RetourResolver.php

Spacing +2 added lines, -2 removed lines

@@ -40,8 +40,8 @@
             $siteId = $source->siteId;
         } else {
             // Otherwise use the passed in arguments, or defaults
-            $uri = $arguments['uri'] ?? '/';
-            $siteId = $arguments['siteId'] ?? null;
+            $uri = $arguments[ 'uri' ] ?? '/';
+            $siteId = $arguments[ 'siteId' ] ?? null;
         }
         $uri = trim($uri === '/' ? '__home__' : $uri);
 

src/gql/interfaces/RetourInterface.php

Spacing +2 added lines, -2 removed lines

@@ -48,9 +48,9 @@
 
         $type = GqlEntityRegistry::createEntity(self::class, new InterfaceType([
             'name' => static::getName(),
-            'fields' => self::class.'::getFieldDefinitions',
+            'fields' => self::class . '::getFieldDefinitions',
             'description' => 'This is the interface implemented by Retour.',
-            'resolveType' => function (array $value) {
+            'resolveType' => function(array $value) {
                 return GqlEntityRegistry::getEntity(RetourGenerator::getName());
             },
         ]));

src/gql/types/generators/RetourGenerator.php

Spacing +5 added lines, -5 removed lines

@@ -34,24 +34,24 @@
      */
     public static function generateTypes($context = null): array
     {
-        $gqlTypes = [];
+        $gqlTypes = [ ];
         $retourFields = RetourInterface::getFieldDefinitions();
         $retourArgs = RetourArguments::getArguments();
         $typeName = self::getName();
         $retourType = GqlEntityRegistry::getEntity($typeName)
             ?: GqlEntityRegistry::createEntity($typeName, new RetourType([
                 'name' => $typeName,
-                'args' => function () use ($retourArgs) {
+                'args' => function() use ($retourArgs) {
                     return $retourArgs;
                 },
-                'fields' => function () use ($retourFields) {
+                'fields' => function() use ($retourFields) {
                     return $retourFields;
                 },
                 'description' => 'This entity has all the Retour fields',
             ]));
 
-        $gqlTypes[$typeName] = $retourType;
-        TypeLoader::registerType($typeName, function () use ($retourType) {
+        $gqlTypes[ $typeName ] = $retourType;
+        TypeLoader::registerType($typeName, function() use ($retourType) {
             return $retourType;
         });