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/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/helpers/UrlHelper.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         /** @noinspection CallableParameterUseCaseInTypeContextInspection */
         $url = preg_replace('/{.*}/', '', $url);
         // Remove any linebreaks that may be errantly in the URL
-        $url = (string)str_replace([
+        $url = (string) str_replace([
                 PHP_EOL,
                 "\r",
                 "\n",

src/controllers/TablesController.php

Indentation +6 added lines, -6 removed lines

@@ -90,9 +90,9 @@ 
         string $sort = 'hitCount|desc',
         int    $page = 1,
         int    $per_page = 20,
-               $filter = '',
-               $siteId = 0,
-               $handled = 'all'
+                $filter = '',
+                $siteId = 0,
+                $handled = 'all'
     ): Response
     {
         PermissionHelper::controllerPermissionCheck('retour:dashboard');
@@ -186,9 +186,9 @@ 
         string $sort = 'hitCount|desc',
         int    $page = 1,
         int    $per_page = 20,
-               $filter = '',
-               $siteId = 0,
-               $shortLinks = false
+                $filter = '',
+                $siteId = 0,
+                $shortLinks = false
     ): Response
     {
         PermissionHelper::controllerPermissionCheck('retour:redirects');

Spacing +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
     /**
      * @var    bool|array
      */
-    protected array|bool|int $allowAnonymous = [
+    protected array | bool | int $allowAnonymous = [
     ];
 
     // Public Methods
@@ -124,7 +124,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'referrerUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($handled !== 'all') {
@@ -136,7 +136,7 @@ 
             foreach ($stats as &$stat) {
                 $stat['addLink'] = '';
                 if (!$stat['handledByRetour']) {
-                    $encodedUrl = urlencode('/' . ltrim($stat['redirectSrcUrl'], '/'));
+                    $encodedUrl = urlencode('/'.ltrim($stat['redirectSrcUrl'], '/'));
                     // Add the siteId to the URL, but keep the current behavior of passing in siteId=0 for "all"
                     $statSiteId = $stat['siteId'] ?? 0;
                     try {
@@ -144,7 +144,7 @@ 
                     } catch (SiteNotFoundException $e) {
                         $primarySite = null;
                     }
-                    if ($primarySite !== null && $statSiteId == (int)$primarySite->id) {
+                    if ($primarySite !== null && $statSiteId == (int) $primarySite->id) {
                         $statSiteId = 0;
                     }
                     $stat['addLink'] = UrlHelper::cpUrl('retour/add-redirect', [
@@ -220,7 +220,7 @@ 
             ->orderBy([$sortField => $sortType])
             ->filterWhere(['like', 'redirectSrcUrl', $filter])
             ->orFilterWhere(['like', 'redirectDestUrl', $filter]);
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($shortLinks) {
@@ -260,7 +260,7 @@ 
                 }
             }
 
-            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/' . $redirect['id']);
+            $redirect['editLink'] = UrlHelper::cpUrl('retour/edit-redirect/'.$redirect['id']);
         }
         // Format the data for the API
         if ($redirects) {

src/helpers/MultiSite.php

Spacing +3 added lines, -3 removed lines

@@ -89,7 +89,7 @@ 
                         $siteId = reset($variables['enabledSiteIds']);
                     }
                 } else {
-                    self::requirePermission('editSite:' . $siteId);
+                    self::requirePermission('editSite:'.$siteId);
                 }
             }
         }
@@ -114,7 +114,7 @@ 
             } else {
                 $variables['sitesMenuLabel'] = Craft::t(
                     'site',
-                    $sites->getSiteById((int)$variables['currentSiteId'])->name
+                    $sites->getSiteById((int) $variables['currentSiteId'])->name
                 );
             }
         } else {
@@ -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 {