nystudio107 / craft-retour

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;

tests/_bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -5,12 +5,12 @@
 ini_set('date.timezone', 'UTC');
 
 // Use the current installation of Craft
-define('CRAFT_STORAGE_PATH', __DIR__ . '/_craft/storage');
-define('CRAFT_TEMPLATES_PATH', __DIR__ . '/_craft/templates');
-define('CRAFT_CONFIG_PATH', __DIR__ . '/_craft/config');
-define('CRAFT_MIGRATIONS_PATH', __DIR__ . '/_craft/migrations');
-define('CRAFT_TRANSLATIONS_PATH', __DIR__ . '/_craft/translations');
-define('CRAFT_VENDOR_PATH', dirname(__DIR__) . '/vendor');
+define('CRAFT_STORAGE_PATH', __DIR__.'/_craft/storage');
+define('CRAFT_TEMPLATES_PATH', __DIR__.'/_craft/templates');
+define('CRAFT_CONFIG_PATH', __DIR__.'/_craft/config');
+define('CRAFT_MIGRATIONS_PATH', __DIR__.'/_craft/migrations');
+define('CRAFT_TRANSLATIONS_PATH', __DIR__.'/_craft/translations');
+define('CRAFT_VENDOR_PATH', dirname(__DIR__).'/vendor');
 define('CRAFT_TESTS_PATH', __DIR__);
 
 $devMode = true;

src/services/Events.php

Spacing +4 added lines, -4 removed lines

@@ -102,14 +102,14 @@ 
                     if (strcmp($oldUri, $newUri) !== 0) {
                         // Handle trailing slash config setting
                         if (Craft::$app->config->general->addTrailingSlashesToUrls) {
-                            $oldUri = rtrim($oldUri, '/') . '/';
-                            $newUri = rtrim($newUri, '/') . '/';
+                            $oldUri = rtrim($oldUri, '/').'/';
+                            $newUri = rtrim($newUri, '/').'/';
                         }
                         // Handle the URL match type
                         if (Retour::$settings->uriChangeRedirectSrcMatch === 'fullurl') {
                             try {
                                 if ($redirectSiteId !== null) {
-                                    $redirectSiteId = (int)$redirectSiteId;
+                                    $redirectSiteId = (int) $redirectSiteId;
                                 }
                                 $oldUri = \craft\helpers\UrlHelper::siteUrl($oldUri, null, null, $redirectSiteId);
                                 $newUri = UrlHelper::siteUrl($newUri, null, null, $redirectSiteId);
@@ -127,7 +127,7 @@ 
                             'siteId' => $redirectSiteId,
                         ];
                         // Trigger a 'beforeSaveEntryRedirect' event
-                        $isNew = (int)$redirectConfig['id'] === 0;
+                        $isNew = (int) $redirectConfig['id'] === 0;
                         $event = new RedirectEvent([
                             'isNew' => $isNew,
                             'legacyUrl' => $redirectConfig['redirectSrcUrl'],

src/services/Statistics.php

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
     public function getRecentStatistics($days = 1, $handled = false): array
     {
         // Ensure is an int
-        $handledInt = (int)$handled;
+        $handledInt = (int) $handled;
         $stats = [];
         $db = Craft::$app->getDb();
         if ($db->getIsMysql()) {
@@ -210,9 +210,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
@@ -356,7 +356,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/controllers/ChartsController.php

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
                     'COUNT(handledByRetour = 1 or null) as handled_cnt',
                 ])
                 ->where("hitLastTime >= ( CURDATE() - INTERVAL '{$days}' DAY )");
-            if ((int)$siteId !== 0) {
+            if ((int) $siteId !== 0) {
                 $query->andWhere(['siteId' => $siteId]);
             }
             $query
@@ -99,7 +99,7 @@ 
                     "COUNT(CASE WHEN \"handledByRetour\" = true THEN 1 END) as handled_cnt",
                 ])
                 ->where("\"hitLastTime\" >= ( CURRENT_TIMESTAMP - INTERVAL '{$days} days' )");
-            if ((int)$siteId !== 0) {
+            if ((int) $siteId !== 0) {
                 $query->andWhere(['siteId' => $siteId]);
             }
             $query
@@ -163,8 +163,8 @@ 
         }
         if ($stats) {
             $data = [
-                (int)$stats,
-                (int)$handledStats,
+                (int) $stats,
+                (int) $handledStats,
             ];
         }
 

src/gql/types/generators/RetourGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -41,17 +41,17 @@
         $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) {
+        TypeLoader::registerType($typeName, function() use ($retourType) {
             return $retourType;
         });
 

src/gql/queries/RetourQuery.php

Spacing +3 added lines, -3 removed lines

@@ -41,14 +41,14 @@ 
             'retour' => [
                 'type' => RetourInterface::getType(),
                 'args' => RetourArguments::getArguments(),
-                'resolve' => RetourResolver::class . '::resolve',
+                'resolve' => RetourResolver::class.'::resolve',
                 'description' => 'This query is used to query for Retour redirects.',
                 'deprecationReason' => 'This query is deprecated and will be removed in the future. You should use `retourResolveRedirect` instead.',
             ],
             'retourResolveRedirect' => [
                 'type' => RetourInterface::getType(),
                 'args' => RetourArguments::getArguments(),
-                'resolve' => RetourResolver::class . '::resolve',
+                'resolve' => RetourResolver::class.'::resolve',
                 'description' => 'This query is used to query for Retour redirects.',
             ],
             'retourRedirects' => [
@@ -65,7 +65,7 @@ 
                         'description' => 'The siteId to list all redirects for.'
                     ],
                 ],
-                'resolve' => RetourResolver::class . '::resolveAll',
+                'resolve' => RetourResolver::class.'::resolveAll',
                 'description' => 'This query is used to query for all Retour redirects for a site.',
             ],
         ];

src/gql/resolvers/RetourResolver.php

Spacing +2 added lines, -2 removed lines

@@ -64,8 +64,8 @@
             if ($redirect === null && Craft::$app->getElements()->getElementByUri(trim($uri, '/'), $siteId) === null) {
                 // Set the `site` virtual field
                 $redirect['site'] = null;
-                if (isset($redirect['siteId']) && (int)$redirect['siteId'] !== 0) {
-                    $site = Craft::$app->getSites()->getSiteById((int)$redirect['siteId']);
+                if (isset($redirect['siteId']) && (int) $redirect['siteId'] !== 0) {
+                    $site = Craft::$app->getSites()->getSiteById((int) $redirect['siteId']);
                     if ($site !== null) {
                         $redirect['site'] = $site->handle;
                     }

src/listeners/GetCraftQLSchema.php

Spacing +8 added lines, -8 removed lines

@@ -62,36 +62,36 @@
                 // Boolean field
                 $retourField
                     ->addBooleanField($field)
-                    ->resolve(function ($redirect) use ($field) {
+                    ->resolve(function($redirect) use ($field) {
                         $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (bool)$result;
+                        return $result === null ? $result : (bool) $result;
                     });
             } elseif (in_array($field, self::INT_FIELDS, true)) {
                 // Integer field
                 $retourField
                     ->addIntField($field)
-                    ->resolve(function ($redirect) use ($field) {
+                    ->resolve(function($redirect) use ($field) {
                         $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (int)$result;
+                        return $result === null ? $result : (int) $result;
                     });
             } else {
                 // String field
                 $retourField
                     ->addStringField($field)
-                    ->resolve(function ($redirect) use ($field) {
+                    ->resolve(function($redirect) use ($field) {
                         $result = $redirect[$field] ?? null;
-                        return $result === null ? $result : (string)$result;
+                        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 */