nystudio107 / craft-webperf

src/controllers/TablesController.php

Spacing +13 added lines, -13 removed lines

@@ -104,7 +104,7 @@ 
             ->offset($offset)
             ->where(['between', 'dateCreated', $start, $end])
         ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($filter !== '') {
@@ -143,8 +143,8 @@ 
             $index = 1;
             foreach ($stats as &$stat) {
                 $stat['id'] = $index++;
-                $stat['cnt'] = (int)$stat['cnt'];
-                $stat['maxTotalPageLoad'] = (int)$maxTotalPageLoad;
+                $stat['cnt'] = (int) $stat['cnt'];
+                $stat['maxTotalPageLoad'] = (int) $maxTotalPageLoad;
                 // Decode any emojis in the title
                 if (!empty($stat['title'])) {
                     $stat['title'] = html_entity_decode($stat['title'], ENT_NOQUOTES, 'UTF-8');
@@ -242,7 +242,7 @@ 
             ->where(['url' => $pageUrl])
             ->andWhere(['between', 'dateCreated', $start, $end])
         ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($filter !== '') {
@@ -274,7 +274,7 @@ 
                     $stat['type'] = 'frontend';
                 }
                 if ($stat['pageLoad'] > $maxTotalPageLoad) {
-                    $maxTotalPageLoad = (int)$stat['pageLoad'];
+                    $maxTotalPageLoad = (int) $stat['pageLoad'];
                 }
             }
             // Massage the stats
@@ -283,8 +283,8 @@ 
                     $date = DateTimeHelper::toDateTime($stats['dateCreated']);
                     $stats['dateCreated'] = $date->format('Y-m-d H:i:s');
                 }
-                $stat['mobile'] = (bool)$stat['mobile'];
-                $stat['maxTotalPageLoad'] = (int)$maxTotalPageLoad;
+                $stat['mobile'] = (bool) $stat['mobile'];
+                $stat['maxTotalPageLoad'] = (int) $maxTotalPageLoad;
                 // Decode any emojis in the title
                 if (!empty($stat['title'])) {
                     $stat['title'] = html_entity_decode($stat['title'], ENT_NOQUOTES, 'UTF-8');
@@ -396,7 +396,7 @@ 
                     'SUM(case when [[type]] = \'boomerang\' then 1 else 0 end) as [[boomerangCount]]',
                 ]);
         }
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($filter !== '') {
@@ -417,9 +417,9 @@ 
             $user = Craft::$app->getUser()->getIdentity();
             // Massage the stats
             foreach ($stats as &$stat) {
-                $stat['cnt'] = (int)$stat['cnt'];
-                $stat['craftCount'] = (int)$stat['craftCount'];
-                $stat['boomerangCount'] = (int)$stat['boomerangCount'];
+                $stat['cnt'] = (int) $stat['cnt'];
+                $stat['craftCount'] = (int) $stat['craftCount'];
+                $stat['boomerangCount'] = (int) $stat['boomerangCount'];
                 // Decode any emojis in the title
                 if (!empty($stat['title'])) {
                     $stat['title'] = html_entity_decode($stat['title'], ENT_NOQUOTES, 'UTF-8');
@@ -536,7 +536,7 @@ 
             ->andWhere(['between', '[[webperf_error_samples.dateCreated]]', $start, $end])
             ->leftJoin('{{%webperf_data_samples}} webperf_data_samples', '[[webperf_data_samples.requestId]] = [[webperf_error_samples.requestId]]')
         ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         if ($filter !== '') {
@@ -564,7 +564,7 @@ 
                     $stats['dateCreated'] = $date->format('Y-m-d H:i:s');
                 }
                 if (isset($stat['mobile'])) {
-                    $stat['mobile'] = (bool)$stat['mobile'];
+                    $stat['mobile'] = (bool) $stat['mobile'];
                 }
                 // Decode any emojis in the title
                 if (!empty($stat['title'])) {

src/recommendations/MemoryLimit.php

Spacing +7 added lines, -7 removed lines

@@ -35,14 +35,14 @@ 
      */
     public function evaluate()
     {
-        $phpMemoryLimit = (int)$this->memoryLimit();
-        $this->sample->craftTotalMemory = (int)$this->sample->craftTotalMemory;
+        $phpMemoryLimit = (int) $this->memoryLimit();
+        $this->sample->craftTotalMemory = (int) $this->sample->craftTotalMemory;
         if ($phpMemoryLimit && $this->sample->craftTotalMemory) {
             $ratio = $phpMemoryLimit / $this->sample->craftTotalMemory;
-            $displayCraftTotalMemory = (($this->sample->craftTotalMemory / 1024) / 1024) . 'M';
-            $displayPhpMemoryLimit = (($phpMemoryLimit / 1024) / 1024) . 'M';
-            $displayCraftMinMemory = ((self::MIN_CRAFT_MEMORY / 1024) / 1024) . 'M';
-            $displayCraftMaxMemory = ((self::MAX_CRAFT_MEMORY / 1024) / 1024) . 'M';
+            $displayCraftTotalMemory = (($this->sample->craftTotalMemory / 1024) / 1024).'M';
+            $displayPhpMemoryLimit = (($phpMemoryLimit / 1024) / 1024).'M';
+            $displayCraftMinMemory = ((self::MIN_CRAFT_MEMORY / 1024) / 1024).'M';
+            $displayCraftMaxMemory = ((self::MAX_CRAFT_MEMORY / 1024) / 1024).'M';
             $this->summary = Craft::t(
                 'webperf',
                 'Check the `memory_limit` setting in your `php.ini` file',
@@ -114,6 +114,6 @@ 
             }
         }
 
-        return (int)$memoryLimit;
+        return (int) $memoryLimit;
     }
 }

src/Webperf.php

Spacing +17 added lines, -17 removed lines

@@ -323,7 +323,7 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
+            function(PluginEvent $event) {
                 if ($event->plugin === $this) {
                     // Invalidate our caches after we've been installed
                     $this->clearAllCaches();
@@ -351,7 +351,7 @@ 
         Event::on(
             CraftVariable::class,
             CraftVariable::EVENT_INIT,
-            function (Event $event) {
+            function(Event $event) {
                 /** @var CraftVariable $variable */
                 $variable = $event->sender;
                 $variable->set('webperf', WebperfVariable::class);
@@ -361,11 +361,11 @@ 
         Event::on(
             Plugins::class,
             Plugins::EVENT_AFTER_LOAD_PLUGINS,
-            function () {
+            function() {
                 // Install these only after all other plugins have loaded
                 $request = Craft::$app->getRequest();
                 // Only respond to non-console site requests
-                if ($request->getIsSiteRequest() && !$request->getIsConsoleRequest()  && !$request->getIsLivePreview()) {
+                if ($request->getIsSiteRequest() && !$request->getIsConsoleRequest() && !$request->getIsLivePreview()) {
                     $this->handleSiteRequest();
                 }
                 // Respond to Control Panel requests
@@ -385,7 +385,7 @@ 
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_SITE_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
                     __METHOD__
@@ -408,7 +408,7 @@ 
         Event::on(
             UrlManager::class,
             UrlManager::EVENT_REGISTER_CP_URL_RULES,
-            function (RegisterUrlRulesEvent $event) {
+            function(RegisterUrlRulesEvent $event) {
                 Craft::debug(
                     'UrlManager::EVENT_REGISTER_CP_URL_RULES',
                     __METHOD__
@@ -424,7 +424,7 @@ 
         Event::on(
             UserPermissions::class,
             UserPermissions::EVENT_REGISTER_PERMISSIONS,
-            function (RegisterUserPermissionsEvent $event) {
+            function(RegisterUserPermissionsEvent $event) {
                 Craft::debug(
                     'UserPermissions::EVENT_REGISTER_PERMISSIONS',
                     __METHOD__
@@ -454,7 +454,7 @@ 
             Event::on(
                 View::class,
                 View::EVENT_END_PAGE,
-                function () {
+                function() {
                     Craft::debug(
                         'View::EVENT_END_PAGE',
                         __METHOD__
@@ -482,7 +482,7 @@ 
             Event::on(
                 View::class,
                 View::EVENT_END_BODY,
-                function () {
+                function() {
                     Craft::debug(
                         'View::EVENT_END_BODY',
                         __METHOD__
@@ -505,7 +505,7 @@ 
             Event::on(
                 Application::class,
                 Application::EVENT_AFTER_REQUEST,
-                function () {
+                function() {
                     Craft::debug(
                         'Application::EVENT_AFTER_REQUEST',
                         __METHOD__
@@ -531,21 +531,21 @@ 
         if (self::$settings->displaySidebar && $currentUser && $currentUser->can('webperf:sidebar')) {
             $view = Craft::$app->getView();
             // Entries sidebar
-            $view->hook('cp.entries.edit.details', function (&$context) {
+            $view->hook('cp.entries.edit.details', function(&$context) {
                 /** @var  Element $element */
                 $element = $context['entry'] ?? null;
 
                 return $this->renderSidebar($element);
             });
             // Category Groups sidebar
-            $view->hook('cp.categories.edit.details', function (&$context) {
+            $view->hook('cp.categories.edit.details', function(&$context) {
                 /** @var  Element $element */
                 $element = $context['category'] ?? null;
 
                 return $this->renderSidebar($element);
             });
             // Commerce Product Types sidebar
-            $view->hook('cp.commerce.product.edit.details', function (&$context) {
+            $view->hook('cp.commerce.product.edit.details', function(&$context) {
                 /** @var  Element $element */
                 $element = $context['product'] ?? null;
 
@@ -765,7 +765,7 @@ 
     {
         $cache = Craft::$app->getCache();
         // See if there are any recommendations to add as a badge
-        $recommendations = $cache->getOrSet(self::RECOMMENDATIONS_CACHE_KEY, function () {
+        $recommendations = $cache->getOrSet(self::RECOMMENDATIONS_CACHE_KEY, function() {
             $data = [];
             $now = new \DateTime();
             $end = $now->format('Y-m-d');
@@ -783,7 +783,7 @@ 
             $recommendations = '';
         }
 
-        return (string)$recommendations;
+        return (string) $recommendations;
     }
 
     /**
@@ -795,7 +795,7 @@ 
     {
         $cache = Craft::$app->getCache();
         // See if there are any recommendations to add as a badge
-        $errors = $cache->getOrSet(self::ERRORS_CACHE_KEY, function () {
+        $errors = $cache->getOrSet(self::ERRORS_CACHE_KEY, function() {
             $now = new \DateTime();
             $end = $now->format('Y-m-d');
             $start = $now->modify('-30 days')->format('Y-m-d');
@@ -809,6 +809,6 @@ 
             $errors = '⚠';
         }
 
-        return (string)$errors;
+        return (string) $errors;
     }
 }

src/controllers/MetricsController.php

Spacing +3 added lines, -3 removed lines

@@ -163,8 +163,8 @@ 
             if ($userAgent) {
                 $parser = new Parser($userAgent);
                 $sample->device = ($parser->device->model ?? '');
-                $sample->browser = ($parser->browser->name ?? '') . ' ' . $parser->browser->getVersion();
-                $sample->os = ($parser->os->name ?? '') . ' ' . $parser->os->getVersion();
+                $sample->browser = ($parser->browser->name ?? '').' '.$parser->browser->getVersion();
+                $sample->os = ($parser->os->name ?? '').' '.$parser->os->getVersion();
                 $sample->mobile = $parser->isMobile();
             }
             // Save the data sample
@@ -201,7 +201,7 @@ 
             $now = round(microtime(true) * 1000);
             $cache = Craft::$app->getCache();
             $then = $cache->get(self::LAST_BEACON_CACHE_KEY);
-            if (($then !== false) && ($now - (int)$then < Webperf::$settings->rateLimitMs)) {
+            if (($then !== false) && ($now - (int) $then < Webperf::$settings->rateLimitMs)) {
                 $limited = true;
             }
             $cache->set(self::LAST_BEACON_CACHE_KEY, $now, 0);

src/services/ErrorSamples.php

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
             ->from(['{{%webperf_error_samples}}'])
             ->where(['not', [$column => null]])
             ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
 
@@ -122,7 +122,7 @@ 
                 ->andWhere(['url' => $pageUrl])
             ;
         }
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
 
@@ -148,7 +148,7 @@ 
                 ['not', ['title' => '']],
             ])
         ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         $result = $query->one();
@@ -381,7 +381,7 @@ 
         $now = round(microtime(true) * 1000);
         $cache = Craft::$app->getCache();
         $then = $cache->get(self::LAST_ERRORSAMPLES_TRIM_CACHE_KEY);
-        if (($then !== false) && ($now - (int)$then < Webperf::$settings->samplesRateLimitMs)) {
+        if (($then !== false) && ($now - (int) $then < Webperf::$settings->samplesRateLimitMs)) {
             $limited = true;
         }
         $cache->set(self::LAST_ERRORSAMPLES_TRIM_CACHE_KEY, $now, 0);

src/services/DataSamples.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
             ->from(['{{%webperf_data_samples}}'])
             ->where(['not', [$column => null]])
             ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
 
@@ -112,7 +112,7 @@ 
                 ['not', ['title' => '']],
             ])
         ;
-        if ((int)$siteId !== 0) {
+        if ((int) $siteId !== 0) {
             $query->andWhere(['siteId' => $siteId]);
         }
         $result = $query->one();
@@ -425,7 +425,7 @@ 
         $now = round(microtime(true) * 1000);
         $cache = Craft::$app->getCache();
         $then = $cache->get(self::LAST_DATASAMPLES_TRIM_CACHE_KEY);
-        if (($then !== false) && ($now - (int)$then < Webperf::$settings->samplesRateLimitMs)) {
+        if (($then !== false) && ($now - (int) $then < Webperf::$settings->samplesRateLimitMs)) {
             $limited = true;
         }
         $cache->set(self::LAST_DATASAMPLES_TRIM_CACHE_KEY, $now, 0);