@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | if (!empty($string)) { |
| 45 | 45 | $string = strip_tags($string); |
| 46 | - $result = (string)Stringy::create($string)->truncate($length, $substring); |
|
| 46 | + $result = (string) Stringy::create($string)->truncate($length, $substring); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | return $result; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | if (!empty($string)) { |
| 69 | 69 | $string = strip_tags($string); |
| 70 | - $result = (string)Stringy::create($string)->safeTruncate($length, $substring); |
|
| 70 | + $result = (string) Stringy::create($string)->safeTruncate($length, $substring); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | return $result; |
@@ -5,12 +5,12 @@ |
||
| 5 | 5 | ini_set('date.timezone', 'UTC'); |
| 6 | 6 | |
| 7 | 7 | // Use the current installation of Craft |
| 8 | -define('CRAFT_STORAGE_PATH', __DIR__ . '/_craft/storage'); |
|
| 9 | -define('CRAFT_TEMPLATES_PATH', __DIR__ . '/_craft/templates'); |
|
| 10 | -define('CRAFT_CONFIG_PATH', __DIR__ . '/_craft/config'); |
|
| 11 | -define('CRAFT_MIGRATIONS_PATH', __DIR__ . '/_craft/migrations'); |
|
| 12 | -define('CRAFT_TRANSLATIONS_PATH', __DIR__ . '/_craft/translations'); |
|
| 13 | -define('CRAFT_VENDOR_PATH', dirname(__DIR__) . '/vendor'); |
|
| 8 | +define('CRAFT_STORAGE_PATH', __DIR__.'/_craft/storage'); |
|
| 9 | +define('CRAFT_TEMPLATES_PATH', __DIR__.'/_craft/templates'); |
|
| 10 | +define('CRAFT_CONFIG_PATH', __DIR__.'/_craft/config'); |
|
| 11 | +define('CRAFT_MIGRATIONS_PATH', __DIR__.'/_craft/migrations'); |
|
| 12 | +define('CRAFT_TRANSLATIONS_PATH', __DIR__.'/_craft/translations'); |
|
| 13 | +define('CRAFT_VENDOR_PATH', dirname(__DIR__).'/vendor'); |
|
| 14 | 14 | define('CRAFT_TESTS_PATH', __DIR__); |
| 15 | 15 | |
| 16 | 16 | $devMode = true; |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | if (strcmp($oldUri, $newUri) !== 0) { |
| 103 | 103 | // Handle trailing slash config setting |
| 104 | 104 | if (Craft::$app->config->general->addTrailingSlashesToUrls) { |
| 105 | - $oldUri = rtrim($oldUri, '/') . '/'; |
|
| 106 | - $newUri = rtrim($newUri, '/') . '/'; |
|
| 105 | + $oldUri = rtrim($oldUri, '/').'/'; |
|
| 106 | + $newUri = rtrim($newUri, '/').'/'; |
|
| 107 | 107 | } |
| 108 | 108 | // Handle the URL match type |
| 109 | 109 | if (Retour::$settings->uriChangeRedirectSrcMatch === 'fullurl') { |
| 110 | 110 | try { |
| 111 | 111 | if ($redirectSiteId !== null) { |
| 112 | - $redirectSiteId = (int)$redirectSiteId; |
|
| 112 | + $redirectSiteId = (int) $redirectSiteId; |
|
| 113 | 113 | } |
| 114 | 114 | $oldUri = \craft\helpers\UrlHelper::siteUrl($oldUri, null, null, $redirectSiteId); |
| 115 | 115 | $newUri = UrlHelper::siteUrl($newUri, null, null, $redirectSiteId); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | 'siteId' => $redirectSiteId, |
| 128 | 128 | ]; |
| 129 | 129 | // Trigger a 'beforeSaveEntryRedirect' event |
| 130 | - $isNew = (int)$redirectConfig['id'] === 0; |
|
| 130 | + $isNew = (int) $redirectConfig['id'] === 0; |
|
| 131 | 131 | $event = new RedirectEvent([ |
| 132 | 132 | 'isNew' => $isNew, |
| 133 | 133 | 'legacyUrl' => $redirectConfig['redirectSrcUrl'], |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | 'COUNT(handledByRetour = 1 or null) as handled_cnt', |
| 82 | 82 | ]) |
| 83 | 83 | ->where("hitLastTime >= ( CURDATE() - INTERVAL '{$days}' DAY )"); |
| 84 | - if ((int)$siteId !== 0) { |
|
| 84 | + if ((int) $siteId !== 0) { |
|
| 85 | 85 | $query->andWhere(['siteId' => $siteId]); |
| 86 | 86 | } |
| 87 | 87 | $query |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | "COUNT(CASE WHEN \"handledByRetour\" = true THEN 1 END) as handled_cnt", |
| 100 | 100 | ]) |
| 101 | 101 | ->where("\"hitLastTime\" >= ( CURRENT_TIMESTAMP - INTERVAL '{$days} days' )"); |
| 102 | - if ((int)$siteId !== 0) { |
|
| 102 | + if ((int) $siteId !== 0) { |
|
| 103 | 103 | $query->andWhere(['siteId' => $siteId]); |
| 104 | 104 | } |
| 105 | 105 | $query |
@@ -163,8 +163,8 @@ discard block |
||
| 163 | 163 | } |
| 164 | 164 | if ($stats) { |
| 165 | 165 | $data = [ |
| 166 | - (int)$stats, |
|
| 167 | - (int)$handledStats, |
|
| 166 | + (int) $stats, |
|
| 167 | + (int) $handledStats, |
|
| 168 | 168 | ]; |
| 169 | 169 | } |
| 170 | 170 | |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | return; |
| 61 | 61 | } |
| 62 | 62 | // Make sure there is a leading / |
| 63 | - $value = '/' . ltrim($value, '/'); |
|
| 63 | + $value = '/'.ltrim($value, '/'); |
|
| 64 | 64 | $model->$attribute = $value; |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $variables['docsUrl'] = self::DOCUMENTATION_URL; |
| 85 | 85 | $variables['pluginName'] = $pluginName; |
| 86 | 86 | $variables['title'] = $templateTitle; |
| 87 | - $siteHandleUri = Craft::$app->isMultiSite ? '/' . $siteHandle : ''; |
|
| 87 | + $siteHandleUri = Craft::$app->isMultiSite ? '/'.$siteHandle : ''; |
|
| 88 | 88 | $variables['crumbs'] = [ |
| 89 | 89 | [ |
| 90 | 90 | 'label' => $pluginName, |
@@ -92,7 +92,7 @@ discard block |
||
| 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 | 98 | $variables['docTitle'] = "{$pluginName} - {$templateTitle}"; |
@@ -66,13 +66,13 @@ |
||
| 66 | 66 | */ |
| 67 | 67 | public function actionTrim(): int |
| 68 | 68 | { |
| 69 | - echo Craft::t('retour', 'Trimming statistics') . PHP_EOL; |
|
| 69 | + echo Craft::t('retour', 'Trimming statistics').PHP_EOL; |
|
| 70 | 70 | $affectedRows = Retour::$plugin->statistics->trimStatistics($this->limit); |
| 71 | 71 | echo Craft::t( |
| 72 | 72 | 'retour', |
| 73 | 73 | 'Trimmed {rows} from retour_stats table', |
| 74 | 74 | ['rows' => $affectedRows] |
| 75 | - ) . PHP_EOL; |
|
| 75 | + ).PHP_EOL; |
|
| 76 | 76 | |
| 77 | 77 | return 0; |
| 78 | 78 | } |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | // Constants aren't allowed in traits until PHP >= 8.2 |
| 40 | 40 | $majorVersion = '3'; |
| 41 | 41 | // Dev server container name & port are based on the major version of this plugin |
| 42 | - $devPort = 3000 + (int)$majorVersion; |
|
| 43 | - $versionName = 'v' . $majorVersion; |
|
| 42 | + $devPort = 3000 + (int) $majorVersion; |
|
| 43 | + $versionName = 'v'.$majorVersion; |
|
| 44 | 44 | // Merge in the passed config, so it our config can be overridden by Plugins::pluginConfigs['retour'] |
| 45 | 45 | // ref: https://github.com/craftcms/cms/issues/1989 |
| 46 | 46 | $config = ArrayHelper::merge([ |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | 'assetClass' => RetourAsset::class, |
| 54 | 54 | 'checkDevServer' => true, |
| 55 | 55 | 'class' => VitePluginService::class, |
| 56 | - 'devServerInternal' => 'http://craft-retour-' . $versionName . '-buildchain-dev:' . $devPort, |
|
| 57 | - 'devServerPublic' => 'http://localhost:' . $devPort, |
|
| 56 | + 'devServerInternal' => 'http://craft-retour-'.$versionName.'-buildchain-dev:'.$devPort, |
|
| 57 | + 'devServerPublic' => 'http://localhost:'.$devPort, |
|
| 58 | 58 | 'errorEntry' => 'src/js/Retour.js', |
| 59 | 59 | 'useDevServer' => true, |
| 60 | 60 | ], |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | ->addBooleanField($field) |
| 65 | 65 | ->resolve(function($redirect) use ($field) { |
| 66 | 66 | $result = $redirect[$field] ?? null; |
| 67 | - return $result === null ? $result : (bool)$result; |
|
| 67 | + return $result === null ? $result : (bool) $result; |
|
| 68 | 68 | }); |
| 69 | 69 | } elseif (in_array($field, self::INT_FIELDS, true)) { |
| 70 | 70 | // Integer field |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | ->addIntField($field) |
| 73 | 73 | ->resolve(function($redirect) use ($field) { |
| 74 | 74 | $result = $redirect[$field] ?? null; |
| 75 | - return $result === null ? $result : (int)$result; |
|
| 75 | + return $result === null ? $result : (int) $result; |
|
| 76 | 76 | }); |
| 77 | 77 | } else { |
| 78 | 78 | // String field |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | ->addStringField($field) |
| 81 | 81 | ->resolve(function($redirect) use ($field) { |
| 82 | 82 | $result = $redirect[$field] ?? null; |
| 83 | - return $result === null ? $result : (string)$result; |
|
| 83 | + return $result === null ? $result : (string) $result; |
|
| 84 | 84 | }); |
| 85 | 85 | } |
| 86 | 86 | } |