Skip to content

Commit 86161e9

Browse files
authored
Merge pull request #78 from nextcloud/feat/watermarking
feat(Watermarking): Add metadata and watermarks to generated images
2 parents e869448 + 6f710b3 commit 86161e9

26 files changed

+10328
-2036
lines changed

.github/workflows/lint-php-cs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ jobs:
5353
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5454

5555
- name: Install dependencies
56-
run: composer i
56+
run: |
57+
composer i
5758
5859
- name: Lint
5960
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

.github/workflows/phpunit.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
matrix:
3636
php-versions: ['8.2']
3737
databases: ['sqlite']
38-
server-versions: ['master', 'stable32', 'stable31', 'stable30']
38+
server-versions: ['master']
3939

4040
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
4141

@@ -61,7 +61,8 @@ jobs:
6161

6262
- name: Set up PHPUnit
6363
working-directory: apps/${{ env.APP_NAME }}
64-
run: composer i
64+
run: |
65+
composer i
6566
6667
- name: Set up Nextcloud
6768
run: |

.github/workflows/psalm.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ jobs:
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252

5353
- name: Install dependencies
54-
run: composer i
54+
run: |
55+
composer i
5556
5657
- name: Run coding standards check
5758
run: composer run psalm

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The rating depends on the model you select to use.
3030
Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).
3131
3232
]]></description>
33-
<version>4.2.0</version>
33+
<version>5.0.0-dev</version>
3434
<licence>agpl</licence>
3535
<author>Julien Veyssier</author>
3636
<namespace>Replicate</namespace>
@@ -46,7 +46,7 @@ Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud
4646
<screenshot>https://github.com/julien-nc/integration_replicate/raw/main/img/screenshot2.jpg</screenshot>
4747
<screenshot>https://github.com/julien-nc/integration_replicate/raw/main/img/screenshot3.jpg</screenshot>
4848
<dependencies>
49-
<nextcloud min-version="30" max-version="33"/>
49+
<nextcloud min-version="33" max-version="33"/>
5050
</dependencies>
5151
<settings>
5252
<admin>OCA\Replicate\Settings\Admin</admin>

composer.json

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,46 @@
1010
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
1111
"cs:check": "php-cs-fixer fix --dry-run --diff",
1212
"cs:fix": "php-cs-fixer fix",
13-
"psalm": "psalm.phar --no-cache",
14-
"test:unit": "phpunit --config tests/phpunit.xml"
13+
"psalm": "psalm --no-cache",
14+
"psalm:update-baseline": "psalm --threads=1 --update-baseline",
15+
"psalm:update-baseline:force": "psalm --threads=1 --update-baseline --set-baseline=psalm-baseline.xml",
16+
"test:unit": "phpunit --config tests/phpunit.xml",
17+
"post-install-cmd": [
18+
"@composer bin all update --ansi",
19+
"grep -r 'OCA\\\\Replicate\\\\Vendor' ./vendor || vendor/bin/php-scoper add-prefix --prefix='OCA\\Replicate\\Vendor' --output-dir=\".\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\"",
20+
"composer dump-autoload",
21+
"composer install --no-scripts"
22+
],
23+
"post-update-cmd": [
24+
"@composer bin all update --ansi",
25+
"grep -r 'OCA\\\\Replicate\\\\Vendor' ./vendor || vendor/bin/php-scoper add-prefix --prefix='OCA\\Replicate\\Vendor' --output-dir=\".\" --working-dir=\"./vendor/\" -f --config=\"../scoper.inc.php\"",
26+
"composer dump-autoload",
27+
"composer update --no-scripts"
28+
]
1529
},
1630
"require": {
17-
"php": "^8.1"
31+
"php": ">= 8.2",
32+
"bamarni/composer-bin-plugin": "^1.8",
33+
"fileeye/pel": "^0.12.0",
34+
"james-heinrich/getid3": "^1.9"
1835
},
1936
"require-dev": {
20-
"nextcloud/coding-standard": "^1.1",
21-
"psalm/phar": "6.*",
22-
"nextcloud/ocp": "dev-master",
23-
"phpunit/phpunit": "^9.5"
37+
"nextcloud/ocp": "dev-master"
2438
},
2539
"config": {
40+
"allow-plugins": {
41+
"bamarni/composer-bin-plugin": true,
42+
"composer/package-versions-deprecated": true
43+
},
2644
"platform": {
27-
"php": "8.1.0"
45+
"php": "8.2"
46+
}
47+
},
48+
"extra": {
49+
"bamarni-bin": {
50+
"bin-links": true,
51+
"target-directory": "vendor-bin",
52+
"forward-command": true
2853
}
2954
}
3055
}

0 commit comments

Comments
 (0)