Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
034b391
info.xml: allow usage with nextcloud v29
printminion-co May 7, 2024
50fb10b
info.xml: set version to 0.0.2
printminion-co May 7, 2024
fda858e
package.json: disable stylelint, stylelint:fix
printminion-co May 7, 2024
e59f671
package.json: add noop build script
printminion-co May 7, 2024
f650f78
reuse: add project files to AGPL-3.0-or-later license
printminion-co May 7, 2024
4602bcb
replace deprecated node v16 with v20
printminion-co May 7, 2024
a8a75c2
remove unused .gitlab-ci.yml
printminion-co May 29, 2024
c185163
remove the .gitattributes
printminion-co May 28, 2024
45f321d
remove composer.phar, phpunit.phar
printminion-co May 28, 2024
612efe5
add AGPL-3.0 license
printminion-co May 29, 2024
865eb80
.eslintrc.js: set overrides for track.js
printminion-co May 29, 2024
21f1396
package.json: fix lint paths
printminion-co May 28, 2024
1234f81
(!) package.json: drop unused dependencies
printminion-co May 29, 2024
259061c
track.js: remove comment lines
printminion-co May 28, 2024
a07d7f1
track.js: disable eslint for GTM snippet
printminion-co May 29, 2024
dd72021
track.js: restrict referrer
printminion-co May 8, 2024
b22fcdb
track.js: restrict url
printminion-co May 8, 2024
42c548b
Application.php: allow GA4 CSP
printminion-co May 10, 2024
06dbdc0
tests: remove initial php tests
printminion-co May 28, 2024
813aa33
github workflow: switch to php v8.1, v8.2
printminion-co May 28, 2024
5a15abe
(!) rename app "enc_analytics" to "googleanalytics"
printminion-co May 28, 2024
a69f199
upgrade composer.lock
printminion-co May 28, 2024
ba3d89c
add/change link to bugtracker
printminion-co May 29, 2024
0b529bc
add php-cs-fixer target dir
printminion-co May 29, 2024
bd1846f
.gitignore exclude .phpunit.result.cache
printminion-co May 29, 2024
dc5c642
add php tests
printminion-co May 29, 2024
eaa4297
reformat php with php-cs-fixer
printminion-co May 29, 2024
a8c521b
composer: change name, update dependencies
printminion-co May 30, 2024
f43b1e2
workflows: change lint names
printminion-co May 30, 2024
061dae3
workflows: use hashes as image references
printminion-co May 30, 2024
99df2c2
workflows: set node version to 20
printminion-co May 30, 2024
4590acc
workflows: add dependabot
printminion-co May 30, 2024
e04a0f2
composer: upgrade nextcloud/ocp to v29.0.1
printminion-co May 30, 2024
cd81d03
workflows: phpunit tests with nextcloud stable29
printminion-co May 30, 2024
c89d3a5
Application.php: split CSP domains setting
printminion-co Jun 12, 2024
410a54d
Application.php: add CSP for GTM preview mode
printminion-co Jun 12, 2024
7beba14
workflows: phpunit-oci.yml fix docker v1 deprecation
printminion-co Jun 12, 2024
b22d4cb
track.js: document the "f" and "u" magic strings
thlehmann-ionos Jul 11, 2024
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
13 changes: 12 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,16 @@
module.exports = {
extends: [
'@nextcloud',
]
],
overrides: [
{
files: ['js/track.js'],
rules: {
semi: 'off',
},
globals: {
dataLayer: 'readonly',
},
},
],
}
3 changes: 0 additions & 3 deletions .gitattributes

This file was deleted.

57 changes: 57 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
# SPDX-FileCopyrightText: Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

version: 2
updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
- package-ecosystem: composer
directory: "/vendor-bin/cs-fixer"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
- package-ecosystem: composer
directory: "/vendor-bin/openapi-extractor"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
- package-ecosystem: composer
directory: "/vendor-bin/phpunit"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
- package-ecosystem: composer
directory: "/vendor-bin/psalm"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
12 changes: 6 additions & 6 deletions .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-FileCopyrightText: Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

name: Lint
name: Lint eslint

on:
pull_request:
Expand All @@ -23,17 +23,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@v1.2
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
id: versions
with:
fallbackNode: '^16'
fallbackNpm: '^7'
fallbackNode: '^20'
fallbackNpm: '^10'

- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ steps.versions.outputs.nodeVersion }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-info-xml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-FileCopyrightText: Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

name: Lint
name: Lint info.xml

on:
pull_request:
Expand All @@ -21,13 +21,13 @@ jobs:
name: info.xml lint
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Download schema
run: wget https://raw.githubusercontent.com/nextcloud/appstore/master/nextcloudappstore/api/v1/release/info.xsd

- name: Lint info.xml
uses: ChristophWurst/xmllint-action@v1
uses: ChristophWurst/xmllint-action@36f2a302f84f8c83fceea0b9c59e1eb4a616d3c1 # v1.2
with:
xml-file: ./appinfo/info.xml
xml-schema-file: ./info.xsd
6 changes: 3 additions & 3 deletions .github/workflows/lint-php-cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-FileCopyrightText: Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

name: Lint
name: Lint php-cs

on:
pull_request:
Expand All @@ -22,12 +22,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
with:
php-version: "7.4"
php-version: "8.1"
coverage: none

- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-FileCopyrightText: Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

name: Lint
name: Lint php

on:
pull_request:
Expand All @@ -19,16 +19,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["7.4", "8.0", "8.1"]
php-versions: ["8.1", "8.2"]

name: php-lint

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Set up php ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
uses: shivammathur/setup-php@a4e22b60bbb9c1021113f2860347b0759f66fe5d # v2
with:
php-version: ${{ matrix.php-versions }}
coverage: none
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/lint-stylelint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# SPDX-FileCopyrightText: Nextcloud contributors
# SPDX-License-Identifier: AGPL-3.0-or-later

name: Lint
name: Lint stylelint

on:
pull_request:
Expand All @@ -22,17 +22,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Read package.json node and npm engines version
uses: skjnldsv/read-package-engines-version-actions@v1.1
uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.2
id: versions
with:
fallbackNode: '^16'
fallbackNpm: '^7'
fallbackNode: '^20'
fallbackNpm: '^10'

- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
uses: actions/setup-node@v2
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v3
with:
node-version: ${{ steps.versions.outputs.nodeVersion }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:

strategy:
matrix:
php-versions: ['7.4', '8.0', '8.1']
server-versions: ['master']
php-versions: ['8.1', '8.2']
server-versions: ['stable29']

services:
mysql:
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Set app env
run: |
# Split and keep last
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
echo "APP_NAME=googleanalytics" >> $GITHUB_ENV

- name: Enable ONLY_FULL_GROUP_BY MySQL option
run: |
Expand Down
23 changes: 19 additions & 4 deletions .github/workflows/phpunit-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,35 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
server-versions: ['master']
php-versions: ['8.1', '8.2']
server-versions: ['stable29']

services:
oracle:
image: deepdiver/docker-oracle-xe-11g # 'wnameless/oracle-xe-11g-r2'
image: ghcr.io/gvenzl/oracle-xe:11

# Provide passwords and other environment variables to container
env:
ORACLE_RANDOM_PASSWORD: true
APP_USER: autotest
APP_USER_PASSWORD: owncloud

# Forward Oracle port
ports:
- 1521:1521/tcp

# Provide healthcheck script options for startup
options: >-
--health-cmd healthcheck.sh
--health-interval 10s
--health-timeout 5s
--health-retries 10

steps:
- name: Set app env
run: |
# Split and keep last
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
echo "APP_NAME=googleanalytics" >> $GITHUB_ENV

- name: Checkout server
uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/phpunit-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
server-versions: ['master']
php-versions: ['8.1', '8.2']
server-versions: ['stable29']

services:
postgres:
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Set app env
run: |
# Split and keep last
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
echo "APP_NAME=googleanalytics" >> $GITHUB_ENV

- name: Checkout server
uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
server-versions: ['master']
php-versions: ['8.1', '8.2']
server-versions: ['stable29']

steps:
- name: Set app env
run: |
# Split and keep last
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
echo "APP_NAME=googleanalytics" >> $GITHUB_ENV

- name: Checkout server
uses: actions/checkout@v3
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@
node_modules/
/.php_cs.cache
js/*hot-update.*
composer.phar
phpunit.phar

# Tests - auto-generated files
/tests/.phpunit.result.cache
18 changes: 0 additions & 18 deletions .gitlab-ci.yml

This file was deleted.

14 changes: 7 additions & 7 deletions .php_cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

$config = new Config();
$config
->getFinder()
->ignoreVCSIgnored(true)
->notPath('build')
->notPath('l10n')
->notPath('src')
->notPath('vendor')
->in(__DIR__);
->getFinder()
->ignoreVCSIgnored(true)
->notPath('build')
->notPath('l10n')
->notPath('src')
->notPath('vendor')
->in(__DIR__);
return $config;
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: ENC Analytics
Upstream-Contact: Mikhailo Matiyenko-Kupriyanov <[email protected]>
Source: https://github.com/nextcloud/profiler

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

Expand Down
Loading