Skip to content

build(deps-dev): Bump nextcloud/coding-standard from 1.3.2 to 1.4.0 in /vendor-bin/coding-standard #636

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.

Sign up for GitHub

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

Merged
skjnldsv merged 3 commits into from
Aug 21, 2025
+53 −68
Merged

build(deps-dev): Bump nextcloud/coding-standard from 1.3.2 to 1.4.0 in /vendor-bin/coding-standard #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57d73d9
build(deps-dev): Bump nextcloud/coding-standard
dependabot[bot] Jul 1, 2025
f6e4a9e
chore: composer run cs:fix
come-nc Jul 1, 2025
955f3bd
chore: Remove test file and update updater.phar
come-nc Jul 1, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
/vendor/bin
/vendor/symfony/console/Tests
/vendor/symfony/debug/Tests
/vendor/symfony/service-contracts/Test
/vendor-bin/**/vendor
.php-cs-fixer.cache
8 changes: 4 additions & 4 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,8 +964,8 @@ public function deleteOldFiles(): void {
throw new \Exception('core/shipped.json is not available');
}
$shippedAppsFileContentDecoded = json_decode($shippedAppsFileContent, true);
if (!is_array($shippedAppsFileContentDecoded) ||
!is_array($shippedApps = $shippedAppsFileContentDecoded['shippedApps'] ?? [])) {
if (!is_array($shippedAppsFileContentDecoded)
|| !is_array($shippedApps = $shippedAppsFileContentDecoded['shippedApps'] ?? [])) {
throw new \Exception('core/shipped.json content is invalid');
}

Expand All @@ -975,8 +975,8 @@ public function deleteOldFiles(): void {
throw new \Exception('core/shipped.json is not available in the new release');
}
$newShippedAppsFileContentDecoded = json_decode($newShippedAppsFileContent, true);
if (!is_array($newShippedAppsFileContentDecoded) ||
!is_array($newShippedApps = $newShippedAppsFileContentDecoded['shippedApps'] ?? [])) {
if (!is_array($newShippedAppsFileContentDecoded)
|| !is_array($newShippedApps = $newShippedAppsFileContentDecoded['shippedApps'] ?? [])) {
throw new \Exception('core/shipped.json content is invalid in the new release');
}

Expand Down
4 changes: 2 additions & 2 deletions lib/UpdateCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
//
// Handle `occ upgrade` run
//

if ($this->skipUpgrade) {
$this->updater->log('[info] "occ upgrade" was skipped');
$this->updater->log('[info] updater finished');
Expand Down Expand Up @@ -334,7 +334,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
//
// Handle maintenance mode toggle
//

$output->writeln('');
if ($input->isInteractive()) {
/** @var QuestionHelper */
Expand Down
8 changes: 4 additions & 4 deletions lib/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -946,8 +946,8 @@ public function deleteOldFiles(): void {
throw new \Exception('core/shipped.json is not available');
}
$shippedAppsFileContentDecoded = json_decode($shippedAppsFileContent, true);
if (!is_array($shippedAppsFileContentDecoded) ||
!is_array($shippedApps = $shippedAppsFileContentDecoded['shippedApps'] ?? [])) {
if (!is_array($shippedAppsFileContentDecoded)
|| !is_array($shippedApps = $shippedAppsFileContentDecoded['shippedApps'] ?? [])) {
throw new \Exception('core/shipped.json content is invalid');
}

Expand All @@ -957,8 +957,8 @@ public function deleteOldFiles(): void {
throw new \Exception('core/shipped.json is not available in the new release');
}
$newShippedAppsFileContentDecoded = json_decode($newShippedAppsFileContent, true);
if (!is_array($newShippedAppsFileContentDecoded) ||
!is_array($newShippedApps = $newShippedAppsFileContentDecoded['shippedApps'] ?? [])) {
if (!is_array($newShippedAppsFileContentDecoded)
|| !is_array($newShippedApps = $newShippedAppsFileContentDecoded['shippedApps'] ?? [])) {
throw new \Exception('core/shipped.json content is invalid in the new release');
}

Expand Down
4 changes: 2 additions & 2 deletions tests/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ public function maintenanceModeShouldBe($state) {
shell_exec('chmod +x occ');
exec('./occ maintenance:mode', $output, $returnCode);

$expectedOutput = 'Maintenance mode is currently ' .
($state === 'on' ? 'enabled' : 'disabled');
$expectedOutput = 'Maintenance mode is currently '
. ($state === 'on' ? 'enabled' : 'disabled');

if ($returnCode !== 0 || strpos(join(PHP_EOL, $output), $expectedOutput) === false) {
throw new Exception('Maintenance mode does not match ' . PHP_EOL . join(PHP_EOL, $output));
Expand Down
Binary file modified updater.phar
View file
Open in desktop
Binary file not shown.
59 changes: 34 additions & 25 deletions vendor-bin/coding-standard/composer.lock
View file
Open in desktop

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

1 change: 0 additions & 1 deletion vendor/composer/autoload_classmap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@
'Symfony\\Contracts\\Service\\ServiceProviderInterface' => $vendorDir . '/symfony/service-contracts/ServiceProviderInterface.php',
'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberInterface.php',
'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberTrait.php',
'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => $vendorDir . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
'Symfony\\Polyfill\\Intl\\Grapheme\\Grapheme' => $vendorDir . '/symfony/polyfill-intl-grapheme/Grapheme.php',
'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Normalizer.php',
Expand Down
1 change: 0 additions & 1 deletion vendor/composer/autoload_static.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ class ComposerStaticInit936ba63ded5d1b8248cdb4d5673af0ea
'Symfony\\Contracts\\Service\\ServiceProviderInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceProviderInterface.php',
'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberInterface.php',
'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberTrait.php',
'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => __DIR__ . '/..' . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
'Symfony\\Polyfill\\Intl\\Grapheme\\Grapheme' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/Grapheme.php',
'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Normalizer.php',
Expand Down
12 changes: 6 additions & 6 deletions vendor/composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php return array(
'root' => array(
'name' => '__root__',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'b3abd9dd7a47e3d528896ef838a12193a08cd3db',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => null,
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev' => true,
),
'versions' => array(
'__root__' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => 'b3abd9dd7a47e3d528896ef838a12193a08cd3db',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => null,
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down
23 changes: 0 additions & 23 deletions vendor/symfony/service-contracts/Test/ServiceLocatorTest.php
View file
Open in desktop

This file was deleted.