Skip to content

Commit 6981085

Browse files
authored
Merge pull request #1244 from nextcloud/v1.4.0
v1.4.0 Nextcloud 29
2 parents 81cc085 + 33b225f commit 6981085

File tree

8 files changed

+50
-23
lines changed

8 files changed

+50
-23
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
php-versions: [8.1, 8.2, 8.3]
16-
nextcloud-versions: ['stable28']
16+
nextcloud-versions: ['stable28', 'stable29']
1717
name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
1818
steps:
1919
- name: Set up php${{ matrix.php-versions }}

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## 1.4.0 - 2024.04.28 Nextcloud Hub 8
8+
- Compability changes to Nextcloud 29.
9+
710
## 1.3.0 - 2023.12.12 Nextcloud Hub 7
811
- Compability changes to Nextcloud 28.
912

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- **📱 Devices:** Lost your phone? Check the map!
1515
- **〰 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.
1616
]]></description>
17-
<version>1.3.1</version>
17+
<version>1.4.0</version>
1818
<licence>agpl</licence>
1919
<author mail="eneiluj@posteo.net">Julien Veyssier</author>
2020
<author mail="kontakt+github@arne.email">Arne Hamann</author>
@@ -33,7 +33,7 @@
3333
<screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot3.png</screenshot>
3434
<dependencies>
3535
<lib>exif</lib>
36-
<nextcloud min-version="28" max-version="28"/>
36+
<nextcloud min-version="28" max-version="29"/>
3737
<php min-version="8.1" max-version="8.3"/>
3838
</dependencies>
3939
<repair-steps>

composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,10 @@
1111
"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",
1212
"test:unit": "phpunit -c tests/phpunit.unit.xml --fail-on-warning",
1313
"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"
14+
},
15+
"autoload": {
16+
"files": [
17+
"lib/Helper/functions.php"
18+
]
1419
}
1520
}

lib/Controller/PublicTracksController.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,7 @@
4545
use OCA\Maps\Service\TracksService;
4646
use OCP\Share\IManager as ShareManager;
4747

48-
49-
/**
50-
* @param string $text
51-
* @return string
52-
*/
53-
function remove_utf8_bom(string $text): string {
54-
$bom = pack('H*','EFBBBF');
55-
$text = preg_replace("/^$bom/", '', $text);
56-
return $text;
57-
}
48+
use function OCA\Maps\Helper\remove_utf8_bom;
5849

5950
class PublicTracksController extends PublicPageController {
6051

lib/Controller/TracksController.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,7 @@
3737

3838
use OCA\Maps\Service\TracksService;
3939

40-
/**
41-
* @param string $text
42-
* @return string
43-
*/
44-
function remove_utf8_bom(string $text): string {
45-
$bom = pack('H*','EFBBBF');
46-
$text = preg_replace("/^$bom/", '', $text);
47-
return $text;
48-
}
40+
use function OCA\Maps\Helper\remove_utf8_bom;
4941

5042
class TracksController extends Controller {
5143

lib/Helper/functions.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* @copyright Copyright (c) 2024 Arne Hamann <git@arne.email>
4+
*
5+
* @author Arne Hamann <git@arne.email>
6+
*
7+
* @license GNU AGPL version 3 or any later version
8+
*
9+
* This program is free software: you can redistribute it and/or modify
10+
* it under the terms of the GNU Affero General Public License as
11+
* published by the Free Software Foundation, either version 3 of the
12+
* License, or (at your option) any later version.
13+
*
14+
* This program is distributed in the hope that it will be useful,
15+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
* GNU Affero General Public License for more details.
18+
*
19+
* You should have received a copy of the GNU Affero General Public License
20+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
21+
*
22+
*/
23+
24+
namespace OCA\Maps\Helper;
25+
26+
/**
27+
* function remove_utf8_bom
28+
*
29+
* @param string $text
30+
* @return string
31+
*/
32+
function remove_utf8_bom(string $text): string {
33+
$bom = pack('H*','EFBBBF');
34+
$text = preg_replace("/^$bom/", '', $text);
35+
return $text;
36+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "maps",
3-
"version": "1.3.1",
3+
"version": "1.4.0",
44
"description": "Maps app",
55
"main": "main.js",
66
"directories": {

0 commit comments

Comments
 (0)