Merge pull request #1244 from nextcloud/v1.4.0

v1.4.0 Nextcloud 29

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
         strategy:
             matrix:
                 php-versions: [8.1, 8.2, 8.3]
-                nextcloud-versions: ['stable28']
+                nextcloud-versions: ['stable28', 'stable29']
         name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
         steps:
             - name: Set up php${{ matrix.php-versions }}

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.4.0 - 2024.04.28 Nextcloud Hub 8
+- Compability changes to Nextcloud 29.
+
 ## 1.3.0 - 2023.12.12 Nextcloud Hub 7
 - Compability changes to Nextcloud 28.
 

appinfo/info.xml

@@ -14,7 +14,7 @@
 - **📱 Devices:** Lost your phone? Check the map!
 - **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.
     ]]></description>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
     <licence>agpl</licence>
     <author mail="[email protected]">Julien Veyssier</author>
     <author mail="[email protected]">Arne Hamann</author>
@@ -33,7 +33,7 @@
     <screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot3.png</screenshot>
     <dependencies>
         <lib>exif</lib>
-        <nextcloud min-version="28" max-version="28"/>
+        <nextcloud min-version="28" max-version="29"/>
         <php min-version="8.1" max-version="8.3"/>
     </dependencies>
     <repair-steps>

composer.json

@@ -11,5 +11,10 @@
 		"test:integration:dev": "phpunit -c tests/phpunit.integration.xml --no-coverage --order-by=defects --stop-on-defect --fail-on-warning --stop-on-error --stop-on-failure",
 		"test:unit": "phpunit -c tests/phpunit.unit.xml --fail-on-warning",
 		"test:unit:dev": "phpunit -c tests/phpunit.unit.xml --no-coverage --order-by=defects --stop-on-defect --fail-on-warning --stop-on-error --stop-on-failure"
+	},
+	"autoload": {
+		"files": [
+			"lib/Helper/functions.php"
+		]
 	}
 }

lib/Controller/PublicTracksController.php

@@ -45,16 +45,7 @@
 use OCA\Maps\Service\TracksService;
 use OCP\Share\IManager as ShareManager;
 
-
-/**
- * @param string $text
- * @return string
- */
-function remove_utf8_bom(string $text): string {
-    $bom = pack('H*','EFBBBF');
-    $text = preg_replace("/^$bom/", '', $text);
-    return $text;
-}
+use function OCA\Maps\Helper\remove_utf8_bom;
 
 class PublicTracksController extends PublicPageController {
 

lib/Controller/TracksController.php

@@ -37,15 +37,7 @@
 
 use OCA\Maps\Service\TracksService;
 
-/**
- * @param string $text
- * @return string
- */
-function remove_utf8_bom(string $text): string {
-    $bom = pack('H*','EFBBBF');
-    $text = preg_replace("/^$bom/", '', $text);
-    return $text;
-}
+use function OCA\Maps\Helper\remove_utf8_bom;
 
 class TracksController extends Controller {
 

lib/Helper/functions.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * @copyright Copyright (c) 2024 Arne Hamann <[email protected]>
+ *
+ * @author Arne Hamann <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Maps\Helper;
+
+/**
+ * function remove_utf8_bom
+ *
+ * @param string $text
+ * @return string
+ */
+function remove_utf8_bom(string $text): string {
+	$bom = pack('H*','EFBBBF');
+	$text = preg_replace("/^$bom/", '', $text);
+	return $text;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "maps",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Maps app",
   "main": "main.js",
   "directories": {