Patch array objects for PHP 8.1 (#999)

* Patch array objects for PHP 8 * Reswitch getting counts * Update WallPresenter.php * Update WallPresenter.php * Fix
OpenVK · Oct 25, 2023 · 49a7047 · 49a7047
1 parent e3b9fb9
commit 49a7047
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php
@@ -74,7 +74,7 @@ function renderWall(int $user, bool $embedded = false): void
         $this->template->paginatorConf = (object) [
             "count"   => $this->template->count,
             "page"    => (int) ($_GET["p"] ?? 1),
-            "amount"  => sizeof($this->template->posts),
+            "amount"  => $this->template->posts->getRowCount(),
             "perPage" => OPENVK_DEFAULT_PER_PAGE,
         ];
 
@@ -152,9 +152,9 @@ function renderFeed(): void
                    ->where("deleted", 0)
                    ->order("created DESC");
         $this->template->paginatorConf = (object) [
-            "count"   => sizeof($posts),
+            "count"   => $posts->getRowCount(),
             "page"    => (int) ($_GET["p"] ?? 1),
-            "amount"  => sizeof($posts->page((int) ($_GET["p"] ?? 1), $perPage)),
+            "amount"  => $posts->page((int) ($_GET["p"] ?? 1), $perPage)->getRowCount(),
             "perPage" => $perPage,
         ];
         $this->template->posts = [];
@@ -182,7 +182,7 @@ function renderGlobalFeed(): void
         $this->template->paginatorConf = (object) [
             "count"   => $count,
             "page"    => (int) ($_GET["p"] ?? 1),
-            "amount"  => sizeof($posts),
+            "amount"  => $posts->getRowCount(),
             "perPage" => $pPage,
         ];
         foreach($posts as $post)
@@ -332,7 +332,7 @@ function renderMakePost(int $wall): void
         foreach($photos as $photo)
         	$post->attach($photo);
 
-        if(sizeof($videos) > 0)
+        if($videos->count() > 0)
             foreach($videos as $vid)
                 $post->attach($vid);
 

diff --git a/Web/Presenters/templates/Admin/Logs.xml b/Web/Presenters/templates/Admin/Logs.xml
@@ -9,7 +9,7 @@
 {/block}
 
 {block content}
-    {var $amount = sizeof($logs)}
+    {var $amount = $logs->getRowCount()}
 
     <style>
         del, ins { text-decoration: none; color: #000; }

diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml
@@ -142,7 +142,7 @@
     {include "../components/paginator.xml", conf => (object) [
         "page"     => $page,
         "count"    => $count,
-        "amount"   => sizeof($data),
+        "amount"   => $data->getRowCount(),
         "perPage"  => $perPage ?? OPENVK_DEFAULT_PER_PAGE,
         "atBottom" => false,
     ]}
@@ -356,4 +356,4 @@
         <input class="button" type="button" id="dnt" value="{_reset}" onclick="resetSearch()">
     </div>
 
-{/block}
+{/block}