Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): Remove dev dependency on nextcloud/ocp #1547

Merged
merged 2 commits into from
Oct 25, 2024
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
5 changes: 1 addition & 4 deletions .github/workflows/behat-sqlite-encryption.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,7 @@ jobs:

- name: Install composer dependencies
working-directory: apps/${{ env.APP_NAME }}
run: |
composer i
# remove as those dev dependencies pull in an outdated psr/log
composer remove --dev nextcloud/ocp
run: composer i

- name: Set up Nextcloud
env:
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/behat-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,7 @@ jobs:

- name: Install composer dependencies
working-directory: apps/${{ env.APP_NAME }}
run: |
composer i
# remove as those dev dependencies pull in an outdated psr/log
composer remove --dev nextcloud/ocp
run: composer i

- name: Set up Nextcloud
env:
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"ext-dom": "*",
"bamarni/composer-bin-plugin": "^1.8",
"guzzlehttp/guzzle": "^7.8",
"nextcloud/ocp": "dev-stable27",
"rector/rector": "^1.2.0"
},
"scripts": {
Expand Down
253 changes: 3 additions & 250 deletions composer.lock

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

2 changes: 1 addition & 1 deletion lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public function boot(IBootcontext $context): void {
}

private function registerMountProvider(IMountProviderCollection $collection,
MountProvider $provider): void {
MountProvider $provider): void {
$collection->registerProvider($provider);
}
}
10 changes: 5 additions & 5 deletions lib/Controller/PageTrashController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ class PageTrashController extends Controller {
use ErrorHelper;

public function __construct(
string $appName,
IRequest $request,
private PageService $service,
IUserSession $userSession,
private LoggerInterface $logger,
string $appName,
IRequest $request,
private PageService $service,
IUserSession $userSession,
private LoggerInterface $logger,
) {
parent::__construct($appName, $request);
$this->userSession = $userSession;
Expand Down
2 changes: 1 addition & 1 deletion lib/SetupChecks/CirclesAppIsEnableCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

class CirclesAppIsEnableCheck implements ISetupCheck {
public function __construct(
private IL10N $l10n,
private IL10N $l10n,
private IAppManager $appManager,
) {
}
Expand Down
2 changes: 1 addition & 1 deletion lib/SetupChecks/PDOSQLiteDriverIsEnableCheck.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

class PDOSQLiteDriverIsEnableCheck implements ISetupCheck {
public function __construct(
private IL10N $l10n,
private IL10N $l10n,
private SearchService $searchService,
) {
}
Expand Down
Loading
Loading