Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ updates:
labels:
- 3. to review
- dependencies
- package-ecosystem: composer
directory: "/vendor-bin/cs-fixer"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies
- package-ecosystem: npm
directory: "/"
schedule:
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 @@ -34,7 +34,7 @@ concurrency:

jobs:
phpunit-oci:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

strategy:
matrix:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ nbproject
/tests/js/run.sh
/tests/karma-coverage
/vendor
/vendor-bin/*/vendor
/.php-cs-fixer.cache

# Vue.js
Expand Down
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

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

use Nextcloud\CodingStandard\Config;

Expand Down
27 changes: 22 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"platform": {
"php": "8.0"
},
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
"autoload-dev": {
"psr-4": {
Expand All @@ -18,18 +21,32 @@
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "vendor/bin/php-cs-fixer fix --dry-run --diff",
"cs:fix": "vendor/bin/php-cs-fixer fix",
"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 --set-baseline=tests/psalm-baseline.xml",
"psalm:clear": "psalm.phar--clear-cache && psalm.phar--clear-global-cache",
"psalm:fix": "psalm.phar--alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml --color --fail-on-warning --fail-on-risky"
"test:unit": "vendor/bin/phpunit -c tests/phpunit.xml --color --fail-on-warning --fail-on-risky",
"post-install-cmd": [
"@composer bin all install --ansi"
],
"post-update-cmd": [
"@composer bin all update --ansi"
]
},
"require-dev": {
"nextcloud/coding-standard": "^1.0.0",
"nextcloud/ocp": "dev-master",
"phpunit/phpunit": "^9.5",
"psalm/phar": "^5.15"
},
"extra": {
"bamarni-bin": {
"bin-links": true,
"forward-command": false
}
},
"require": {
"bamarni/composer-bin-plugin": "^1.8"
}
}
163 changes: 64 additions & 99 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor-bin/cs-fixer/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"platform": {
"php": "8.0"
},
"sort-packages": true,
"require-dev": {
"nextcloud/coding-standard": "^1.1"
}
}
Loading