Code cleanup

putyourlightson · Feb 12, 2024 · 9710566 · 9710566
1 parent 3ced84c
commit 9710566
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/src/console/controllers/CacheController.php b/src/console/controllers/CacheController.php
@@ -562,8 +562,13 @@ private function _deploy(array $siteUris): void
      */
     private function _output(string $message): void
     {
-        $processUser = posix_getpwuid(posix_geteuid());
-        $user = $processUser['name'] ?? 'unknown';
+        $user = 'unknown';
+
+        if (function_exists('posix_getpwuid')) {
+            $processUser = posix_getpwuid(posix_geteuid());
+            $user = $processUser['name'] ?? $user;
+        }
+
         Blitz::$plugin->log($message . ' [via console command by "{user}"]', ['user' => $user]);
 
         $this->stdout(Craft::t('blitz', $message) . PHP_EOL, BaseConsole::FG_GREEN);

diff --git a/src/controllers/DiagnosticsController.php b/src/controllers/DiagnosticsController.php
@@ -47,7 +47,7 @@ public function actionExportPages(int $siteId): Response
             ->all();
 
         $values = [];
-        foreach ($pages as &$page) {
+        foreach ($pages as $page) {
             $values[] = [
                 'uri' => $page['uri'] ?: '/',
                 'elements' => $page['elementCount'] ?: 0,

diff --git a/src/helpers/DiagnosticsHelper.php b/src/helpers/DiagnosticsHelper.php
@@ -231,7 +231,8 @@ public static function getElementQuerySql(string $elementQueryType, string $para
 
             // Return raw SQL with line breaks replaced with spaces.
             return str_replace(["\r\n", "\r", "\n"], ' ', $sql);
-        } catch (QueryAbortedException) {
+        } /** @noinspection PhpRedundantCatchClauseInspection */
+        catch (QueryAbortedException) {
             return null;
         }
     }

diff --git a/src/records/ElementQuerySourceRecord.php b/src/records/ElementQuerySourceRecord.php
@@ -9,7 +9,6 @@
 use craft\db\ActiveRecord;
 
 /**
- * @property int $id
  * @property int $sourceId
  * @property int $queryId
  * @property-read ElementQueryRecord $elementQuery

diff --git a/src/records/IncludeRecord.php b/src/records/IncludeRecord.php
@@ -10,6 +10,7 @@
 
 /**
  * @property int $id
+ * @property int $index [bigint(20)]
  * @property int $siteId
  * @property string $template
  * @property string $params

diff --git a/src/services/ExpireCacheService.php b/src/services/ExpireCacheService.php
@@ -15,6 +15,8 @@
 use putyourlightson\blitz\records\CacheRecord;
 
 /**
+ * @property-read int[] $expiredCacheIds
+ *
  * @since 4.8.0
  */
 class ExpireCacheService extends Component