Revert unwanted formatting, add checks if functions exists, add inflate for content loaded from resource

Author: Adam Halfar

src/Model/Entity/Panel.php

@@ -46,22 +46,20 @@ class Panel extends Entity
      */
     protected function _getContent(mixed $content): string
     {
-        if (is_string($content)) {
+        if (is_resource($content)) {
+            $content = (string)stream_get_contents($content);
+        }
+
+        if (is_string($content) && function_exists('gzinflate')) {
             // phpcs:disable
             $contentInflated = @gzinflate($content);
             // phpcs:enable
             if ($contentInflated !== false) {
                 return $contentInflated;
             }
-
-            return $content;
         }
 
-        if (is_resource($content)) {
-            return (string)stream_get_contents($content);
-        }
-
-        return '';
+        return $content;
     }
 
     /**
@@ -72,9 +70,9 @@ protected function _getContent(mixed $content): string
      */
     protected function _setContent(mixed $content): mixed
     {
-        if (is_string($content)) {
+        if (is_string($content) && function_exists('gzdeflate')) {
             $contentDeflated = gzdeflate($content, 9);
-            if ($contentDeflated !== false) {
+            if ($contentDeflated) {
                 $content = $contentDeflated;
             }
         }

src/Model/Table/RequestsTable.php

@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 /**
@@ -35,7 +34,8 @@
  * @method \DebugKit\Model\Entity\Request[] patchEntities($entities, array $data, array $options = [])
  * @method \DebugKit\Model\Entity\Request findOrCreate($search, callable $callback = null, array $options = [])
  */
-class RequestsTable extends Table {
+class RequestsTable extends Table
+{
     use LazyTableTrait;
     use SqlTraceTrait;
 
@@ -45,7 +45,8 @@ class RequestsTable extends Table {
      * @param array $config Config data.
      * @return void
      */
-    public function initialize(array $config): void {
+    public function initialize(array $config): void
+    {
         $this->hasMany('DebugKit.Panels', [
             'sort' => ['Panels.title' => 'ASC'],
         ]);
@@ -62,7 +63,8 @@ public function initialize(array $config): void {
      *
      * @return string
      */
-    public static function defaultConnectionName(): string {
+    public static function defaultConnectionName(): string
+    {
         return 'debug_kit';
     }
 
@@ -72,7 +74,8 @@ public static function defaultConnectionName(): string {
      * @param \Cake\ORM\Query\SelectQuery $query The query
      * @return \Cake\ORM\Query\SelectQuery The query.
      */
-    public function findRecent(SelectQuery $query): SelectQuery {
+    public function findRecent(SelectQuery $query): SelectQuery
+    {
         return $query->orderBy(['Requests.requested_at' => 'DESC'])
             ->limit(10);
     }
@@ -82,7 +85,8 @@ public function findRecent(SelectQuery $query): SelectQuery {
      *
      * @return bool
      */
-    protected function shouldGc(): bool {
+    protected function shouldGc(): bool
+    {
         return rand(1, 10) === 10;
     }
 
@@ -91,7 +95,8 @@ protected function shouldGc(): bool {
      *
      * @return bool
      */
-    protected function shouldGcVacuum(): bool {
+    protected function shouldGcVacuum(): bool
+    {
         return rand(1, 10) === 10;
     }
 
@@ -104,7 +109,8 @@ protected function shouldGcVacuum(): bool {
      *
      * @return void
      */
-    public function gc(): void {
+    public function gc(): void
+    {
         if (!$this->shouldGc()) {
             return;
         }