Merge branch 'master' of ssh://patema.crystalyx.net:2222/Xefir/epubreader

.drone.yml

@@ -3,8 +3,8 @@ name: default
 type: docker
 
 steps:
-  - name: nextcloud:21
+  - name: nextcloud:22
-    image: nextcloud:21
+    image: nextcloud:22
     commands:
       - curl -sSLo /usr/local/bin/composer https://getcomposer.org/download/latest-stable/composer.phar
       - chmod +x /usr/local/bin/composer

appinfo/info.xml

@@ -29,7 +29,7 @@ See [README] for more exhaustive information on features and potential misfeatur
    [README]: https://github.com/e-alfred/epubreader/blob/master/epubreader/README.md
 	]]>
     </description>
-    <version>1.4.8</version>
+    <version>1.4.9</version>
     <licence>agpl</licence>
     <author>Frank de Lange</author>
     <author>e-alfred</author>
@@ -46,7 +46,7 @@ See [README] for more exhaustive information on features and potential misfeatur
     <screenshot>https://github.com/e-alfred/epubreader/blob/master/screenshots/photo_2017-03-15_17-22-00.jpg?raw=true</screenshot>
     <screenshot>https://github.com/e-alfred/epubreader/blob/master/screenshots/photo_2017-03-15_17-22-02.jpg?raw=true</screenshot>
     <dependencies>
-        <nextcloud min-version="21" max-version="27"/>
+        <nextcloud min-version="22" max-version="27"/>
     </dependencies>
 	<settings>
 		<personal>OCA\Epubreader\Settings\Personal</personal>

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "nextcloud/epubreader",
 	"description": "EPUB/CBZ/PDF ebook reader",
-	"version": "1.4.8",
+	"version": "1.4.9",
 	"type": "project",
 	"license": "AGPL-3.0-or-later",
 	"require-dev": {
@@ -18,7 +18,7 @@
 	},
 	"config": {
 		"platform": {
-			"php": "7.4"
+			"php": "8.0"
 		}
 	}
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5c7be477b217d6074abc6c2f8d2c2256",
+    "content-hash": "7b806afecf0b4bd9cf2aed44f533eaf4",
     "packages": [],
     "packages-dev": [
         {
@@ -94,16 +94,16 @@
         },
         {
             "name": "php-cs-fixer/shim",
-            "version": "v3.17.0",
+            "version": "v3.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/shim.git",
-                "reference": "f51b4aed90565c447136f1d015798f6f7c82490f"
+                "reference": "a517e03dd0727336e502e071cc08e406ac878dba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f51b4aed90565c447136f1d015798f6f7c82490f",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/a517e03dd0727336e502e071cc08e406ac878dba",
-                "reference": "f51b4aed90565c447136f1d015798f6f7c82490f",
+                "reference": "a517e03dd0727336e502e071cc08e406ac878dba",
                 "shasum": ""
             },
             "require": {
@@ -140,9 +140,9 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/shim/issues",
-                "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.17.0"
+                "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.18.0"
             },
-            "time": "2023-05-22T20:00:38+00:00"
+            "time": "2023-06-18T22:26:36+00:00"
         },
         {
             "name": "psalm/phar",
@@ -389,7 +389,7 @@
     "platform": [],
     "platform-dev": [],
     "platform-overrides": {
-        "php": "7.4"
+        "php": "8.0"
     },
     "plugin-api-version": "2.3.0"
 }

lib/Controller/PageController.php

@@ -167,10 +167,7 @@ class PageController extends Controller {
 		];
 	}
 
-	/**
+	private function toJson(array $value): string {
-	 * @param mixed $value
-	 */
-	private function toJson($value): string {
 		return htmlspecialchars(json_encode($value), ENT_QUOTES, 'UTF-8');
 	}
 }

lib/Db/ReaderEntity.php

@@ -24,7 +24,7 @@ abstract class ReaderEntity extends Entity {
 	 *
 	 * @return string|array
 	 */
-	public function conditional_json_decode(string $el) {
+	public function conditional_json_decode(string $el): mixed {
 		/** @var array $result */
 		$result = json_decode($el);
 		if (json_last_error() === JSON_ERROR_NONE) {

lib/Hooks.php

@@ -11,13 +11,13 @@
 namespace OCA\Epubreader;
 
 use OCA\Epubreader\AppInfo\Application;
+use OCA\Epubreader\Utility\Server;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IUser;
 use OCP\IUserSession;
-use OCP\Server;
 
 class Hooks {
 
@@ -79,10 +79,7 @@ class Hooks {
 		$queryBuilder->executeStatement();
 	}
 
-	/**
+	private static function isJson(mixed $string): bool {
-	 * @param mixed $string
-	 */
-	private static function isJson($string): bool {
 		return is_string($string) && is_array(json_decode($string, true)) && json_last_error() == JSON_ERROR_NONE;
 	}
 }

lib/Utility/Server.php

@@ -0,0 +1,57 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Carl Schwan <carl@carlschwan.eu>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\Epubreader\Utility;
+
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+
+/**
+ * Class allowing to inject services into your application. You should
+ * use whenever possible dependency injections instead.
+ *
+ * ```php
+ * use OCP\Server;
+ *
+ * $tagManager = Server::get(ITagManager::class);
+ * ```
+ *
+ * @since 25.0.0
+ */
+final class Server {
+	/**
+	 * @template T
+	 * @param class-string<T>|string $serviceName
+	 * @return T|mixed
+	 * @psalm-template S as class-string<T>|string
+	 * @psalm-param S $serviceName
+	 * @psalm-return (S is class-string<T> ? T : mixed)
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @since 25.0.0
+	 */
+	public static function get(string $serviceName) {
+		/** @psalm-suppress UndefinedClass */
+		return \OC::$server->get($serviceName);
+	}
+}