Merge pull request 'Fixes for php 8.1 compatibility' (#56) from magicDave/tt-rss:php8.1-fixes into master

Reviewed-on: https://git.tt-rss.org/fox/tt-rss/pulls/56

classes/config.php

@@ -359,7 +359,7 @@ class Config {
 
 			if ($check == "version") {
 
-				$rv["version"] = strftime("%y.%m", (int)$timestamp) . "-$commit";
+				$rv["version"] = date("Y.m", (int)$timestamp) . "-$commit";
 				$rv["commit"] = $commit;
 				$rv["timestamp"] = $timestamp;
 

classes/debug.php

@@ -88,7 +88,7 @@ class Debug {
 
         if (!self::$enabled || self::$loglevel < $level) return false;
 
-        $ts = strftime("%H:%M:%S", time());
+        $ts = date("H:i:s", time());
         if (function_exists('posix_getpid')) {
             $ts = "$ts/" . posix_getpid();
         }

classes/feeditem/atom.php

@@ -70,7 +70,7 @@ class FeedItem_Atom extends FeedItem_Common {
 	 *
 	 * @return string the rewritten XML or original $content
 	 */
-	private function rewrite_content_to_base(?string $base = null, string $content) {
+	private function rewrite_content_to_base(?string $base = null, ?string $content = '') {
 
 		if (!empty($base) && !empty($content)) {
 

classes/feedparser.php

@@ -201,7 +201,7 @@ class FeedParser {
 
 	// libxml may have invalid unicode data in error messages
 	function error() : string {
-		return UConverter::transcode($this->error, 'UTF-8', 'UTF-8');
+		return UConverter::transcode($this->error ?? '', 'UTF-8', 'UTF-8');
 	}
 
 	/** @return array<string> - WARNING: may return invalid unicode data */

classes/feeds.php

@@ -23,7 +23,7 @@ class Feeds extends Handler_Protected {
 	 */
 	private function _format_headlines_list($feed, string $method, string $view_mode, int $limit, bool $cat_view,
 					int $offset, string $override_order, bool $include_children, ?int $check_first_id = null,
-					bool $skip_first_id_check, string $order_by): array {
+					?bool $skip_first_id_check = false, ? string $order_by = ''): array {
 
 		$disable_cache = false;
 

classes/pref/system.php

@@ -138,7 +138,7 @@ class Pref_System extends Handler_Administrative {
 					$sth->execute($errno_values);
 
 					while ($line = $sth->fetch()) {
-						foreach ($line as $k => $v) { $line[$k] = htmlspecialchars($v); }
+						foreach ($line as $k => $v) { $line[$k] = htmlspecialchars($v ?? ''); }
 						?>
 						<tr>
 							<td class='errno'>

classes/rssutils.php

@@ -920,7 +920,7 @@ class RSSUtils {
 					$entry_timestamp = time();
 				}
 
-				$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
+				$entry_timestamp_fmt = date("Y/m/d H:i:s", $entry_timestamp);
 
 				Debug::log("date: $entry_timestamp ($entry_timestamp_fmt)", Debug::LOG_VERBOSE);
 				Debug::log("num_comments: $num_comments", Debug::LOG_VERBOSE);

composer.lock

@@ -21,7 +21,7 @@
                 "shasum": ""
             },
             "require": {
-                "php": "^7"
+                "php": "^8"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "*",

lib/jimIcon.php

@@ -31,7 +31,7 @@ class jimIcon {
                 }
                 if ($a != 127)
                         $this->all_transaprent = 0;
-                return imagecolorallocatealpha($img, $r, $g, $b, $a);
+                return imagecolorallocatealpha($img, $r, $g, $b, (int) $a);
         }
 
         // Given a string with the contents of an .ICO,

vendor/j4mie/idiorm/idiorm.php

@@ -2209,24 +2209,24 @@
         // ---  ArrayAccess  --- //
         // --------------------- //
 
-        public function offsetExists($key) {
-            return array_key_exists($key, $this->_data);
+        public function offsetExists(mixed $offset): bool {
+            return array_key_exists($offset, $this->_data);
         }
 
-        public function offsetGet($key) {
-            return $this->get($key);
+        public function offsetGet(mixed $offset): mixed {
+            return $this->get($offset);
         }
 
-        public function offsetSet($key, $value) {
-            if(is_null($key)) {
+        public function offsetSet(mixed $offset, mixed $value): void {
+            if(is_null($offset)) {
                 throw new InvalidArgumentException('You must specify a key/array index.');
             }
-            $this->set($key, $value);
+            $this->set($offset, $value);
         }
 
-        public function offsetUnset($key) {
-            unset($this->_data[$key]);
-            unset($this->_dirty_fields[$key]);
+        public function offsetUnset(mixed $offset): void {
+            unset($this->_data[$offset]);
+            unset($this->_dirty_fields[$offset]);
         }
 
         // --------------------- //
@@ -2445,7 +2445,7 @@
          * Get the number of records in the result set
          * @return int
          */
-        public function count() {
+        public function count(): int {
             return count($this->_results);
         }
 
@@ -2454,7 +2454,7 @@
          * over the result set.
          * @return \ArrayIterator
          */
-        public function getIterator() {
+        public function getIterator(): Traversable {
             return new ArrayIterator($this->_results);
         }
 
@@ -2463,7 +2463,7 @@
          * @param int|string $offset
          * @return bool
          */
-        public function offsetExists($offset) {
+        public function offsetExists(mixed $offset): bool {
             return isset($this->_results[$offset]);
         }
 
@@ -2472,25 +2472,33 @@
          * @param int|string $offset
          * @return mixed
          */
-        public function offsetGet($offset) {
+        public function offsetGet(mixed $offset): mixed {
             return $this->_results[$offset];
         }
         
         /**
          * ArrayAccess
-         * @param int|string $offset
+         * @param mixed $offset
          * @param mixed $value
          */
-        public function offsetSet($offset, $value) {
+        public function offsetSet(mixed $offset, mixed $value): void {
             $this->_results[$offset] = $value;
         }
 
         /**
          * ArrayAccess
-         * @param int|string $offset
+         * @param mixed $offset
          */
-        public function offsetUnset($offset) {
+        public function offsetUnset(mixed $offset): void {
             unset($this->_results[$offset]);
+	}
+
+        public function __serialize() {
+            return $this->serialize();
+        }
+
+        public function __unserialize($data) {
+            $this->unserialize($data);
         }
 
         /**