@@ -51,7 +51,7 @@ |
||
| 51 | 51 | return true; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - /** |
|
| 54 | + /** |
|
| 55 | 55 | * @inheritdoc |
| 56 | 56 | */ |
| 57 | 57 | public function safeDown() |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | self::$config['server']['publicPath'] = $baseAssetsUrl; |
| 52 | 52 | $useDevServer = getenv('NYS_PLUGIN_DEVSERVER'); |
| 53 | 53 | if ($useDevServer !== false) { |
| 54 | - self::$config['useDevServer'] = (bool)$useDevServer; |
|
| 54 | + self::$config['useDevServer'] = (bool) $useDevServer; |
|
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | $cache = Craft::$app->getCache(); |
| 406 | 406 | $file = $cache->getOrSet( |
| 407 | 407 | self::CACHE_KEY.$path, |
| 408 | - function () use ($path, $callback) { |
|
| 408 | + function() use ($path, $callback) { |
|
| 409 | 409 | $result = null; |
| 410 | 410 | $contents = @file_get_contents($path); |
| 411 | 411 | if ($contents) { |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | protected static function combinePaths(string ...$paths): string |
| 436 | 436 | { |
| 437 | 437 | $last_key = \count($paths) - 1; |
| 438 | - array_walk($paths, function (&$val, $key) use ($last_key) { |
|
| 438 | + array_walk($paths, function(&$val, $key) use ($last_key) { |
|
| 439 | 439 | switch ($key) { |
| 440 | 440 | case 0: |
| 441 | 441 | $val = rtrim($val, '/ '); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | if (!empty($string)) { |
| 44 | 44 | $string = strip_tags($string); |
| 45 | - $result = (string)Stringy::create($string)->truncate($length, $substring); |
|
| 45 | + $result = (string) Stringy::create($string)->truncate($length, $substring); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | return $result; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | if (!empty($string)) { |
| 68 | 68 | $string = strip_tags($string); |
| 69 | - $result = (string)Stringy::create($string)->safeTruncate($length, $substring); |
|
| 69 | + $result = (string) Stringy::create($string)->safeTruncate($length, $substring); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | return $result; |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | } else { |
| 113 | 113 | $variables['sitesMenuLabel'] = Craft::t( |
| 114 | 114 | 'site', |
| 115 | - $sites->getSiteById((int)$variables['currentSiteId'])->name |
|
| 115 | + $sites->getSiteById((int) $variables['currentSiteId'])->name |
|
| 116 | 116 | ); |
| 117 | 117 | } |
| 118 | 118 | } else { |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | } |
| 173 | 173 | |
| 174 | 174 | if (($parsed = parse_url(self::getBaseUrl($site))) === false) { |
| 175 | - Craft::warning('Unable to parse the site base URL: ' . $site->baseUrl); |
|
| 175 | + Craft::warning('Unable to parse the site base URL: '.$site->baseUrl); |
|
| 176 | 176 | continue; |
| 177 | 177 | } |
| 178 | 178 | |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | // Does the site URL specify a base path? |
| 185 | 185 | $parsedPath = !empty($parsed['path']) ? self::normalizePath($parsed['path']) : ''; |
| 186 | - if ($parsedPath && strpos($fullUri . '/', $parsedPath . '/') !== 0) { |
|
| 186 | + if ($parsedPath && strpos($fullUri.'/', $parsedPath.'/') !== 0) { |
|
| 187 | 187 | continue; |
| 188 | 188 | } |
| 189 | 189 | |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | protected static function getBaseUrl(Site $site): string |
| 258 | 258 | { |
| 259 | 259 | if ($site->baseUrl) { |
| 260 | - return rtrim(self::parseEnv($site->baseUrl), '/') . '/'; |
|
| 260 | + return rtrim(self::parseEnv($site->baseUrl), '/').'/'; |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | return null; |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | |
| 74 | 74 | // Render the template with our vars passed in |
| 75 | 75 | try { |
| 76 | - $htmlText = Craft::$app->view->renderTemplate('webperf/' . $templatePath, $params); |
|
| 76 | + $htmlText = Craft::$app->view->renderTemplate('webperf/'.$templatePath, $params); |
|
| 77 | 77 | if ($minifier) { |
| 78 | 78 | // If SEOmatic is installed, get the title from it |
| 79 | 79 | $minify = Craft::$app->getPlugins()->getPlugin(self::MINIFY_PLUGIN_HANDLE); |
@@ -124,7 +124,7 @@ |
||
| 124 | 124 | // Compute the largest page load time |
| 125 | 125 | $maxTotalPageLoad = 0; |
| 126 | 126 | foreach ($stats as &$stat) { |
| 127 | - // Determine the stat type |
|
| 127 | + // Determine the stat type |
|
| 128 | 128 | if (!empty($stat['pageLoad']) && !empty($stat['craftTotalMs'])) { |
| 129 | 129 | $stat['type'] = 'both'; |
| 130 | 130 | } |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | ->offset($offset) |
| 105 | 105 | ->where(['between', 'dateCreated', $start, $end]) |
| 106 | 106 | ; |
| 107 | - if ((int)$siteId !== 0) { |
|
| 107 | + if ((int) $siteId !== 0) { |
|
| 108 | 108 | $query->andWhere(['siteId' => $siteId]); |
| 109 | 109 | } |
| 110 | 110 | if ($filter !== '') { |
@@ -143,8 +143,8 @@ discard block |
||
| 143 | 143 | $index = 1; |
| 144 | 144 | foreach ($stats as &$stat) { |
| 145 | 145 | $stat['id'] = $index++; |
| 146 | - $stat['cnt'] = (int)$stat['cnt']; |
|
| 147 | - $stat['maxTotalPageLoad'] = (int)$maxTotalPageLoad; |
|
| 146 | + $stat['cnt'] = (int) $stat['cnt']; |
|
| 147 | + $stat['maxTotalPageLoad'] = (int) $maxTotalPageLoad; |
|
| 148 | 148 | // Decode any emojis in the title |
| 149 | 149 | if (!empty($stat['title'])) { |
| 150 | 150 | $stat['title'] = html_entity_decode($stat['title'], ENT_NOQUOTES, 'UTF-8'); |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | ->where(['url' => $pageUrl]) |
| 243 | 243 | ->andWhere(['between', 'dateCreated', $start, $end]) |
| 244 | 244 | ; |
| 245 | - if ((int)$siteId !== 0) { |
|
| 245 | + if ((int) $siteId !== 0) { |
|
| 246 | 246 | $query->andWhere(['siteId' => $siteId]); |
| 247 | 247 | } |
| 248 | 248 | if ($filter !== '') { |
@@ -274,7 +274,7 @@ discard block |
||
| 274 | 274 | $stat['type'] = 'frontend'; |
| 275 | 275 | } |
| 276 | 276 | if ($stat['pageLoad'] > $maxTotalPageLoad) { |
| 277 | - $maxTotalPageLoad = (int)$stat['pageLoad']; |
|
| 277 | + $maxTotalPageLoad = (int) $stat['pageLoad']; |
|
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | // Massage the stats |
@@ -283,8 +283,8 @@ discard block |
||
| 283 | 283 | $date = DateTimeHelper::toDateTime($stats['dateCreated']); |
| 284 | 284 | $stats['dateCreated'] = $date->format('Y-m-d H:i:s'); |
| 285 | 285 | } |
| 286 | - $stat['mobile'] = (bool)$stat['mobile']; |
|
| 287 | - $stat['maxTotalPageLoad'] = (int)$maxTotalPageLoad; |
|
| 286 | + $stat['mobile'] = (bool) $stat['mobile']; |
|
| 287 | + $stat['maxTotalPageLoad'] = (int) $maxTotalPageLoad; |
|
| 288 | 288 | // Decode any emojis in the title |
| 289 | 289 | if (!empty($stat['title'])) { |
| 290 | 290 | $stat['title'] = html_entity_decode($stat['title'], ENT_NOQUOTES, 'UTF-8'); |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | 'SUM(case when [[type]] = \'boomerang\' then 1 else 0 end) as [[boomerangCount]]', |
| 397 | 397 | ]); |
| 398 | 398 | } |
| 399 | - if ((int)$siteId !== 0) { |
|
| 399 | + if ((int) $siteId !== 0) { |
|
| 400 | 400 | $query->andWhere(['siteId' => $siteId]); |
| 401 | 401 | } |
| 402 | 402 | if ($filter !== '') { |
@@ -417,9 +417,9 @@ discard block |
||
| 417 | 417 | $user = Craft::$app->getUser()->getIdentity(); |
| 418 | 418 | // Massage the stats |
| 419 | 419 | foreach ($stats as &$stat) { |
| 420 | - $stat['cnt'] = (int)$stat['cnt']; |
|
| 421 | - $stat['craftCount'] = (int)$stat['craftCount']; |
|
| 422 | - $stat['boomerangCount'] = (int)$stat['boomerangCount']; |
|
| 420 | + $stat['cnt'] = (int) $stat['cnt']; |
|
| 421 | + $stat['craftCount'] = (int) $stat['craftCount']; |
|
| 422 | + $stat['boomerangCount'] = (int) $stat['boomerangCount']; |
|
| 423 | 423 | // Decode any emojis in the title |
| 424 | 424 | if (!empty($stat['title'])) { |
| 425 | 425 | $stat['title'] = html_entity_decode($stat['title'], ENT_NOQUOTES, 'UTF-8'); |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | ->andWhere(['between', '[[webperf_error_samples.dateCreated]]', $start, $end]) |
| 537 | 537 | ->leftJoin('{{%webperf_data_samples}} webperf_data_samples', '[[webperf_data_samples.requestId]] = [[webperf_error_samples.requestId]]') |
| 538 | 538 | ; |
| 539 | - if ((int)$siteId !== 0) { |
|
| 539 | + if ((int) $siteId !== 0) { |
|
| 540 | 540 | $query->andWhere(['siteId' => $siteId]); |
| 541 | 541 | } |
| 542 | 542 | if ($filter !== '') { |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | $stats['dateCreated'] = $date->format('Y-m-d H:i:s'); |
| 565 | 565 | } |
| 566 | 566 | if (isset($stat['mobile'])) { |
| 567 | - $stat['mobile'] = (bool)$stat['mobile']; |
|
| 567 | + $stat['mobile'] = (bool) $stat['mobile']; |
|
| 568 | 568 | } |
| 569 | 569 | // Decode any emojis in the title |
| 570 | 570 | if (!empty($stat['title'])) { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | $stats = Webperf::$plugin->profileTarget->stats; |
| 154 | 154 | $request = Craft::$app->getRequest(); |
| 155 | - $pageLoad = (int)($stats['database']['duration'] |
|
| 155 | + $pageLoad = (int) ($stats['database']['duration'] |
|
| 156 | 156 | + $stats['twig']['duration'] |
| 157 | 157 | + $stats['other']['duration']); |
| 158 | 158 | // Allocate a new DataSample, and fill it in |
@@ -162,13 +162,13 @@ discard block |
||
| 162 | 162 | 'queryString' => $request->getQueryString(), |
| 163 | 163 | 'pageLoad' => $pageLoad, |
| 164 | 164 | 'craftTotalMs' => $pageLoad, |
| 165 | - 'craftDbMs' => (int)$stats['database']['duration'], |
|
| 166 | - 'craftDbCnt' => (int)$stats['database']['count'], |
|
| 167 | - 'craftTwigMs' => (int)$stats['twig']['duration'], |
|
| 168 | - 'craftTwigCnt' => (int)$stats['twig']['count'], |
|
| 169 | - 'craftOtherMs' => (int)$stats['other']['duration'], |
|
| 170 | - 'craftOtherCnt' => (int)$stats['other']['count'], |
|
| 171 | - 'craftTotalMemory' => (int)($stats['database']['memory'] |
|
| 165 | + 'craftDbMs' => (int) $stats['database']['duration'], |
|
| 166 | + 'craftDbCnt' => (int) $stats['database']['count'], |
|
| 167 | + 'craftTwigMs' => (int) $stats['twig']['duration'], |
|
| 168 | + 'craftTwigCnt' => (int) $stats['twig']['count'], |
|
| 169 | + 'craftOtherMs' => (int) $stats['other']['duration'], |
|
| 170 | + 'craftOtherCnt' => (int) $stats['other']['count'], |
|
| 171 | + 'craftTotalMemory' => (int) ($stats['database']['memory'] |
|
| 172 | 172 | + $stats['twig']['memory'] |
| 173 | 173 | + $stats['other']['memory']), |
| 174 | 174 | ]); |
@@ -92,8 +92,8 @@ |
||
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | $this->stats[$cat]['count']++; |
| 95 | - $this->stats[$cat]['duration'] += (float)$timing['duration'] * 1000; |
|
| 96 | - $this->stats[$cat]['memory'] += (int)$timing['memoryDiff']; |
|
| 95 | + $this->stats[$cat]['duration'] += (float) $timing['duration'] * 1000; |
|
| 96 | + $this->stats[$cat]['memory'] += (int) $timing['memoryDiff']; |
|
| 97 | 97 | } |
| 98 | 98 | $this->stats['memory'] = memory_get_peak_usage(true); |
| 99 | 99 | if ($final) { |