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
1 change: 0 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ jobs:
uses: shivammathur/setup-php@master
with:
php-version: 8.1
tools: composer:v1
coverage: none
- name: Install dependencies
run: composer i
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/nbproject/private/
tests/.phpunit.result.cache
/vendor
/vendor-bin/*/vendor
composer.phar

/.php_cs.cache
Expand Down
3 changes: 2 additions & 1 deletion .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
require_once './vendor/autoload.php';
require_once './vendor-bin/php-cs-fixer/vendor/autoload.php';

use Nextcloud\CodingStandard\Config;

Expand All @@ -17,5 +17,6 @@
->notPath('l10n')
->notPath('src')
->notPath('vendor')
->notPath('vendor-bin')
->in(__DIR__);
return $config;
4 changes: 4 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ Files: composer.json composer.lock
Copyright: 2018 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-or-later

Files: vendor-bin/php-cs-fixer/composer.json vendor-bin/php-cs-fixer/composer.lock
Copyright: 2024 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-or-later

Files: package.json package-lock.json tests/phpunit.xml
Copyright: 2019 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-or-later
Expand Down
17 changes: 11 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,18 @@
}
],
"scripts": {
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix",
"cs:check": "vendor-bin/php-cs-fixer/vendor/php-cs-fixer/shim/php-cs-fixer fix --dry-run --diff",
"cs:fix": "vendor-bin/php-cs-fixer/vendor/php-cs-fixer/shim/php-cs-fixer fix",
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
"test": "phpunit -c tests/phpunit.xml",
"test:unit": "phpunit -c tests/phpunit.xml tests/Unit",
"test:unit:dev": "phpunit -c tests/phpunit.xml tests/Unit --no-coverage"
"test:unit:dev": "phpunit -c tests/phpunit.xml tests/Unit --no-coverage",
"post-install-cmd": ["@composer bin all install --ansi"],
"post-update-cmd": ["@composer bin all update --ansi"]
},
"require-dev": {
"christophwurst/nextcloud_testing": "^0.12.4",
"nextcloud/coding-standard": "^0.5.0 || ^1.0.0"
"bamarni/composer-bin-plugin": "^1.8.2",
"christophwurst/nextcloud_testing": "^0.12.4"
},
"config": {
"sort-packages": true,
Expand All @@ -39,7 +41,10 @@
"autoloader-suffix": "SuspiciousLogin",
"platform": {
"php": "8.0"
}
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
"autoload" : {
"psr-4": {
Expand Down
Loading