Skip to content

Commit

Permalink
Merge pull request #27410 from nextcloud/dependachristoph/composer/sy…
Browse files Browse the repository at this point in the history
…mfony-4.4.25

Bump Symfony from 4.4.19 to 4.4.25
  • Loading branch information
ChristophWurst authored Jun 9, 2021
2 parents b77a28d + bf564e2 commit c613c8c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion 3rdparty
Submodule 3rdparty updated 85 files
+1 −0 .gitignore
+5 −5 composer.json
+110 −110 composer.lock
+65 −51 composer/InstalledVersions.php
+125 −125 composer/installed.json
+51 −51 composer/installed.php
+17 −17 composer/package-versions-deprecated/src/PackageVersions/Versions.php
+5 −5 symfony/console/Command/Command.php
+1 −1 symfony/console/Command/HelpCommand.php
+1 −1 symfony/console/Command/ListCommand.php
+0 −10 symfony/console/Descriptor/Descriptor.php
+2 −2 symfony/console/Descriptor/TextDescriptor.php
+1 −1 symfony/console/Descriptor/XmlDescriptor.php
+2 −2 symfony/console/EventListener/ErrorListener.php
+5 −5 symfony/console/Exception/CommandNotFoundException.php
+1 −1 symfony/console/Formatter/OutputFormatterStyleStack.php
+4 −0 symfony/console/Helper/Helper.php
+9 −2 symfony/console/Helper/ProgressBar.php
+1 −1 symfony/console/Helper/ProgressIndicator.php
+42 −8 symfony/console/Helper/QuestionHelper.php
+1 −1 symfony/console/Helper/Table.php
+3 −2 symfony/console/Input/ArrayInput.php
+22 −7 symfony/console/Input/InputOption.php
+4 −4 symfony/console/Input/StringInput.php
+1 −1 symfony/console/Output/Output.php
+5 −5 symfony/console/README.md
+7 −2 symfony/console/Style/SymfonyStyle.php
+7 −7 symfony/event-dispatcher/CHANGELOG.md
+5 −5 symfony/event-dispatcher/README.md
+1 −1 symfony/polyfill-ctype/composer.json
+4 −1 symfony/polyfill-iconv/Resources/charset/translit.php
+15 −15 symfony/polyfill-iconv/bootstrap80.php
+1 −1 symfony/polyfill-iconv/composer.json
+1 −1 symfony/polyfill-intl-grapheme/bootstrap80.php
+1 −1 symfony/polyfill-intl-grapheme/composer.json
+11 −11 symfony/polyfill-intl-idn/Resources/unidata/Regex.php
+2 −5 symfony/polyfill-intl-idn/bootstrap80.php
+1 −1 symfony/polyfill-intl-idn/composer.json
+1 −1 symfony/polyfill-intl-normalizer/composer.json
+23 −23 symfony/polyfill-mbstring/Mbstring.php
+1 −1 symfony/polyfill-mbstring/Resources/unidata/lowerCase.php
+102 −27 symfony/polyfill-mbstring/Resources/unidata/upperCase.php
+1 −1 symfony/polyfill-mbstring/bootstrap.php
+3 −3 symfony/polyfill-mbstring/bootstrap80.php
+1 −1 symfony/polyfill-mbstring/composer.json
+1 −1 symfony/polyfill-php72/Php72.php
+1 −1 symfony/polyfill-php72/composer.json
+1 −1 symfony/polyfill-php73/composer.json
+1 −1 symfony/polyfill-php80/composer.json
+2 −2 symfony/process/Process.php
+5 −5 symfony/process/README.md
+9 −9 symfony/routing/CHANGELOG.md
+5 −2 symfony/routing/Exception/MethodNotAllowedException.php
+1 −1 symfony/routing/Generator/UrlGenerator.php
+4 −3 symfony/routing/Loader/AnnotationFileLoader.php
+1 −1 symfony/routing/Loader/XmlFileLoader.php
+5 −5 symfony/routing/README.md
+6 −6 symfony/routing/Route.php
+2 −2 symfony/routing/RouteCollectionBuilder.php
+1 −1 symfony/routing/Router.php
+3 −0 symfony/service-contracts/.gitignore
+1 −3 symfony/service-contracts/Attribute/Required.php
+1 −1 symfony/service-contracts/LICENSE
+1 −1 symfony/service-contracts/README.md
+4 −2 symfony/service-contracts/ServiceLocatorTrait.php
+1 −1 symfony/service-contracts/ServiceSubscriberInterface.php
+4 −1 symfony/service-contracts/ServiceSubscriberTrait.php
+2 −2 symfony/service-contracts/composer.json
+3 −0 symfony/translation-contracts/.gitignore
+1 −1 symfony/translation-contracts/LICENSE
+1 −1 symfony/translation-contracts/README.md
+2 −0 symfony/translation-contracts/TranslatorInterface.php
+6 −2 symfony/translation-contracts/TranslatorTrait.php
+1 −1 symfony/translation-contracts/composer.json
+8 −6 symfony/translation/Catalogue/MergeOperation.php
+8 −6 symfony/translation/Catalogue/TargetOperation.php
+4 −4 symfony/translation/Command/XliffLintCommand.php
+4 −4 symfony/translation/Dumper/XliffFileDumper.php
+13 −0 symfony/translation/Extractor/PhpExtractor.php
+3 −3 symfony/translation/Loader/MoFileLoader.php
+1 −1 symfony/translation/Loader/XliffFileLoader.php
+1 −1 symfony/translation/MessageCatalogue.php
+5 −5 symfony/translation/README.md
+1 −1 symfony/translation/Translator.php
+1 −1 symfony/translation/composer.json
4 changes: 2 additions & 2 deletions apps/user_ldap/lib/Command/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ protected function configure() {
null,
InputOption::VALUE_REQUIRED,
'The offset of the result set. Needs to be a multiple of limit. defaults to 0.',
0
'0'
)
->addOption(
'limit',
null,
InputOption::VALUE_REQUIRED,
'limit the results. 0 means no limit, defaults to 15',
15
'15'
)
;
}
Expand Down
4 changes: 2 additions & 2 deletions core/Command/Db/ConvertType.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ protected function configure() {
null,
InputOption::VALUE_REQUIRED,
'the maximum number of database rows to handle in a single query, bigger tables will be handled in chunks of this size. Lower this if the process runs out of memory during conversion.',
1000
'1000'
)
;
}
Expand Down Expand Up @@ -306,7 +306,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
return;
}

$chunkSize = $input->getOption('chunk-size');
$chunkSize = (int)$input->getOption('chunk-size');

$query = $fromDB->getQueryBuilder();
$query->automaticTablePrefix(false);
Expand Down
4 changes: 2 additions & 2 deletions core/Command/Group/ListCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ protected function configure() {
'l',
InputOption::VALUE_OPTIONAL,
'Number of groups to retrieve',
500
'500'
)->addOption(
'offset',
'o',
InputOption::VALUE_OPTIONAL,
'Offset for retrieving groups',
0
'0'
)->addOption(
'info',
'i',
Expand Down
4 changes: 2 additions & 2 deletions core/Command/User/ListCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ protected function configure() {
'l',
InputOption::VALUE_OPTIONAL,
'Number of users to retrieve',
500
'500'
)->addOption(
'offset',
'o',
InputOption::VALUE_OPTIONAL,
'Offset for retrieving users',
0
'0'
)->addOption(
'output',
null,
Expand Down

0 comments on commit c613c8c

Please sign in to comment.