Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b5c07d5
refactor(docs): Use HiDrive Next instead of ENC
printminion-co Dec 20, 2024
1b60e4e
chore(reuse): extend copyright to test files
printminion-co Dec 20, 2024
6c1e244
chore(reuse): add missing spdx header
printminion-co Dec 20, 2024
bbf2609
chore(reuse): add vendor-bin files
printminion-co Dec 20, 2024
b5e889b
chore(test): use stable30 for tests
printminion-co Dec 20, 2024
8bf7235
chore(update): update composer dependencies
printminion-co Dec 20, 2024
416de22
chore(update): update nextcloud/ocp to v30
printminion-co Dec 20, 2024
69d3164
chore(test): composer add test script
printminion-co Dec 20, 2024
9c406b3
chore(composer): add vendor-bin
printminion-co Dec 20, 2024
510d830
chore(format): add .editorconfig
printminion-co Dec 20, 2024
b32719b
refactor(php): use Constructor property promotion
printminion-co Dec 20, 2024
4bd7ca9
chore(license): add missing spdx header
printminion-co Dec 20, 2024
fcfe19e
refactor(php): add missing strict_types=1
printminion-co Dec 20, 2024
2e266aa
fix(php-cs): wrong config file name. reformat code
printminion-co Dec 20, 2024
373bca3
fix(php): add missing type declarations
printminion-co Dec 20, 2024
ecea148
fix(doc): fix type definition
printminion-co Dec 20, 2024
c8fe458
refactor(phpunit): add schema
printminion-co Dec 20, 2024
d655cd9
refactor(phpunit): add verbose, define test files suffix
printminion-co Dec 20, 2024
11b46ab
test(coverage): add coverage
printminion-co Dec 20, 2024
f0501b1
refactor(test): add integration test and coverage
printminion-co Dec 20, 2024
8bb9fd0
feature(consent): enable tracking via consent cookie
printminion-co Dec 19, 2024
eb67609
fix(php): Property declared dynamically
printminion-co Jan 6, 2025
6310d85
fix(php): Argument matches the parameter's default value
printminion-co Jan 6, 2025
0c71d51
fix(php): Replace security annotations with respective attributes
printminion-co Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# https://editorconfig.org

# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = tab
insert_final_newline = true
trim_trailing_whitespace = true

[*.feature]
indent_size = 2
indent_style = space

[*.yml]
indent_size = 2
indent_style = space

[*.md]
trim_trailing_whitespace = false

[*.svg]
insert_final_newline = false

[package*.json]
indent_size = 2
indent_style = space

[build/psalm-baseline.xml]
indent_size = 2
indent_style = space

[config/*config.php]
indent_size = 2
indent_style = space
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.1', '8.2']
server-versions: ['stable29']
server-versions: ['stable30']

services:
mysql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.1', '8.2']
server-versions: ['stable29']
server-versions: ['stable30']

services:
oracle:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.1', '8.2']
server-versions: ['stable29']
server-versions: ['stable30']

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
php-versions: ['8.1', '8.2']
server-versions: ['stable29']
server-versions: ['stable30']

steps:
- name: Set app env
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
.idea
*.iml
/coverage
clover.xml
/tests/coverage*
/vendor/
/vendor-bin/*/vendor/
/build/
node_modules/
/.php_cs.cache
Expand Down
2 changes: 1 addition & 1 deletion .php_cs-fixer.dist.php → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// SPDX-FileCopyrightText: Mikhailo Matiyenko-Kupriyanov <[email protected]>
// SPDX-License-Identifier: AGPL-3.0-or-later

require_once './vendor/autoload.php';
require_once './vendor-bin/cs-fixer/vendor/autoload.php';

use Nextcloud\CodingStandard\Config;

Expand Down
8 changes: 6 additions & 2 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ENC Analytics
Upstream-Name: HiDrive Next Analytics
Upstream-Contact: Mikhailo Matiyenko-Kupriyanov <[email protected]>
Source: https://github.com/nextcloud/profiler

Files: package-lock.json package.json composer.json composer.lock lib/*.php lib/**/*.php appinfo/* js/*.js README.md
Files: package-lock.json package.json composer.json composer.lock lib/**/* lib/**/ appinfo/* js/* test/**/* README.md
Copyright: Mikhailo Matiyenko-Kupriyanov <[email protected]>
License: AGPL-3.0-or-later

Files: l10n/*.js l10n/*.json
Copyright: Nextcloud translators <https://www.transifex.com/nextcloud/>
License: AGPL-3.0-or-later

Files: vendor-bin/*/composer.json vendor-bin/*/composer.lock
Copyright: 2024 STRATO AG
License: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ENC Analytics
# HiDrive Next Analytics
Place this app in **nextcloud/apps/**
App folder should be "googleanalytics"

Expand Down
6 changes: 3 additions & 3 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);
return [
'routes' => [
['name' => 'JavaScript#tracking', 'url' => '/js/tracking', 'verb' => 'GET']
]
'routes' => [
['name' => 'JavaScript#tracking', 'url' => '/js/tracking', 'verb' => 'GET']
]
];
27 changes: 23 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,49 @@
}
],
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4",
"phpunit/phpunit": "^9",
"sabre/dav": "^4.1",
"sabre/xml": "^2.2",
"symfony/event-dispatcher": "^5.3.11",
"nextcloud/ocp": "v29.0.1",
"nextcloud/ocp": "^v30.0.4",
"psalm/phar": "^4.10",
"nextcloud/coding-standard": "^1.0"
"nextcloud/coding-standard": "^1.3.2"
},
"scripts": {
"post-install-cmd": [
"@composer bin all install --ansi"
],
"post-update-cmd": [
"@composer bin all update --ansi"
],
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff .",
"cs:fix": "php-cs-fixer fix .",
"psalm": "psalm.phar --threads=1",
"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
"psalm:update-baseline:force": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml",
"psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache",
"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType"
"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
"test": "phpunit",
"test:unit": "phpunit tests -c tests/phpunit.xml --colors=always --fail-on-warning --fail-on-risky",
"test:unit:coverage": "export XDEBUG_MODE=coverage && phpunit --configuration tests/phpunit.xml --coverage-html coverage",
"test:unit:integration": "phpunit tests -c tests/phpunit.integration.xml --colors=always --fail-on-warning --fail-on-risky",
"test:unit:integration:coverage": "export XDEBUG_MODE=coverage && phpunit --configuration tests/phpunit.integration.xml --coverage-html coverage"
},
"config": {
"allow-plugins": {
"composer/package-versions-deprecated": true
"composer/package-versions-deprecated": true,
"bamarni/composer-bin-plugin": true
},
"platform": {
"php": "8.1"
}
},
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": false
}
}
}
Loading
Loading