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.

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

Jump to bottom

Bump Symfony family and friends to v4.4.30 #29343

Merged
merged 1 commit into from
Oct 21, 2021
Merged

Bump Symfony family and friends to v4.4.30 #29343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 88 files
+1 −1 .github/workflows/composer.yml
+30 −0 .patches/sabre-xml/correct-version-check.patch
+12 −2 README.md
+9 −5 composer.json
+105 −52 composer.lock
+7 −0 composer.patches.json
+3 −0 composer/autoload_classmap.php
+1 −1 composer/autoload_files.php
+1 −0 composer/autoload_psr4.php
+12 −1 composer/autoload_static.php
+119 −58 composer/installed.json
+33 −24 composer/installed.php
+9 −8 composer/package-versions-deprecated/src/PackageVersions/Versions.php
+1 −0 cweagans/composer-patches/.gitignore
+9 −0 cweagans/composer-patches/LICENSE.md
+205 −0 cweagans/composer-patches/README.md
+30 −0 cweagans/composer-patches/composer.json
+2,568 −0 cweagans/composer-patches/composer.lock
+18 −0 cweagans/composer-patches/phpunit.xml.dist
+70 −0 cweagans/composer-patches/src/PatchEvent.php
+30 −0 cweagans/composer-patches/src/PatchEvents.php
+581 −0 cweagans/composer-patches/src/Patches.php
+39 −0 cweagans/composer-patches/tests/PatchEventTest.php
+0 −12 patches.txt
+7 −0 sabre/xml/PATCHES.txt
+1 −1 sabre/xml/lib/Reader.php
+4 −4 symfony/console/Application.php
+11 −11 symfony/console/Command/Command.php
+1 −1 symfony/console/Event/ConsoleErrorEvent.php
+1 −1 symfony/console/Event/ConsoleEvent.php
+2 −2 symfony/console/Formatter/OutputFormatter.php
+2 −1 symfony/console/Helper/HelperSet.php
+2 −2 symfony/console/Helper/ProgressBar.php
+4 −4 symfony/console/Helper/QuestionHelper.php
+13 −11 symfony/console/Helper/Table.php
+6 −6 symfony/console/Input/ArgvInput.php
+2 −2 symfony/console/Input/ArrayInput.php
+3 −3 symfony/console/Input/Input.php
+6 −6 symfony/console/Input/InputArgument.php
+2 −6 symfony/console/Input/InputDefinition.php
+12 −12 symfony/console/Input/InputInterface.php
+8 −12 symfony/console/Input/InputOption.php
+2 −2 symfony/console/Input/StringInput.php
+1 −1 symfony/console/Logger/ConsoleLogger.php
+1 −1 symfony/console/Output/Output.php
+1 −6 symfony/console/Output/TrimmedBufferOutput.php
+3 −3 symfony/console/Question/Question.php
+1 −1 symfony/console/Style/SymfonyStyle.php
+4 −3 symfony/console/composer.json
+1 −1 symfony/event-dispatcher/Debug/WrappedListener.php
+1 −1 symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php
+1 −1 symfony/event-dispatcher/EventSubscriberInterface.php
+9 −0 symfony/event-dispatcher/GenericEvent.php
+3 −2 symfony/event-dispatcher/composer.json
+11 −1 symfony/polyfill-intl-grapheme/Grapheme.php
+1 −1 symfony/polyfill-php80/README.md
+3 −3 symfony/polyfill-php80/bootstrap.php
+1 −0 symfony/process/InputStream.php
+1 −1 symfony/process/Pipes/AbstractPipes.php
+3 −0 symfony/process/Pipes/UnixPipes.php
+4 −1 symfony/process/Pipes/WindowsPipes.php
+7 −3 symfony/process/Process.php
+2 −1 symfony/process/composer.json
+2 −2 symfony/routing/Generator/UrlGenerator.php
+1 −1 symfony/routing/Loader/AnnotationDirectoryLoader.php
+0 −3 symfony/routing/Loader/AnnotationFileLoader.php
+3 −0 symfony/routing/Loader/Configurator/CollectionConfigurator.php
+3 −0 symfony/routing/Loader/Configurator/ImportConfigurator.php
+1 −1 symfony/routing/Loader/Configurator/Traits/RouteTrait.php
+1 −1 symfony/routing/Loader/ContainerLoader.php
+3 −3 symfony/routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
+2 −2 symfony/routing/Matcher/Dumper/StaticPrefixCollection.php
+1 −1 symfony/routing/Matcher/TraceableUrlMatcher.php
+1 −1 symfony/routing/Matcher/UrlMatcher.php
+1 −57 symfony/routing/Route.php
+2 −0 symfony/routing/RouteCollection.php
+2 −2 symfony/routing/RouteCompiler.php
+3 −2 symfony/routing/composer.json
+3 −0 symfony/translation/DependencyInjection/TranslatorPathsPass.php
+3 −3 symfony/translation/Dumper/XliffFileDumper.php
+1 −1 symfony/translation/Extractor/ExtractorInterface.php
+1 −1 symfony/translation/Extractor/PhpStringTokenParser.php
+2 −2 symfony/translation/Loader/MoFileLoader.php
+1 −1 symfony/translation/Loader/XliffFileLoader.php
+7 −11 symfony/translation/MessageCatalogue.php
+2 −1 symfony/translation/PluralizationRules.php
+15 −14 symfony/translation/Translator.php
+2 −1 symfony/translation/composer.json
55 changes: 24 additions & 31 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,6 @@
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>string[]</code>
<code>string[]</code>
</InvalidReturnType>
<MoreSpecificImplementedParamType occurrences="1">
<code>$members</code>
Expand Down Expand Up @@ -1016,6 +1015,11 @@
<code>\Sabre\Uri\split($this-&gt;principalInfo['uri'])</code>
</UndefinedFunction>
</file>
<file src="apps/encryption/lib/Command/FixEncryptedVersion.php">
<TypeDoesNotContainNull occurrences="1">
<code>$user === null</code>
</TypeDoesNotContainNull>
</file>
<file src="apps/encryption/lib/Command/ScanLegacyFormat.php">
<InvalidOperand occurrences="1">
<code>$this-&gt;scanFolder($output, '/' . $user)</code>
Expand Down Expand Up @@ -1274,28 +1278,18 @@
<code>$this</code>
</InvalidScope>
</file>
<file src="apps/files_external/lib/Command/Applicable.php">
<InvalidArgument occurrences="1">
<code>$mountId</code>
</InvalidArgument>
</file>
<file src="apps/files_external/lib/Command/Config.php">
<InvalidArgument occurrences="1">
<code>$mountId</code>
</InvalidArgument>
</file>
<file src="apps/files_external/lib/Command/Delete.php">
<InvalidArgument occurrences="2">
<code>$mountId</code>
<code>$mountId</code>
</InvalidArgument>
<NullArgument occurrences="1">
<code>null</code>
</NullArgument>
</file>
<file src="apps/files_external/lib/Command/ListCommand.php">
<InvalidScalarArgument occurrences="1">
<code>$userId</code>
</InvalidScalarArgument>
</file>
<file src="apps/files_external/lib/Command/Notify.php">
<InvalidArgument occurrences="2">
<code>$input-&gt;getArgument('mount_id')</code>
<InvalidArgument occurrences="1">
<code>$storage</code>
</InvalidArgument>
<InvalidReturnStatement occurrences="1"/>
Expand All @@ -1310,9 +1304,6 @@
</UndefinedInterfaceMethod>
</file>
<file src="apps/files_external/lib/Command/Verify.php">
<InvalidArgument occurrences="1">
<code>$mountId</code>
</InvalidArgument>
<InvalidScalarArgument occurrences="2">
<code>$e-&gt;getCode()</code>
<code>$status</code>
Expand Down Expand Up @@ -1375,6 +1366,12 @@
<code>clearBucket</code>
</UndefinedMagicMethod>
</file>
<file src="apps/files_external/lib/Lib/Storage/FtpConnection.php">
<UndefinedConstant occurrences="2">
<code>FTP_BINARY</code>
<code>FTP_BINARY</code>
</UndefinedConstant>
</file>
<file src="apps/files_external/lib/Lib/Storage/SFTP.php">
<InternalMethod occurrences="1">
<code>put</code>
Expand Down Expand Up @@ -2285,11 +2282,6 @@
<file src="apps/user_status/lib/Db/UserStatusMapper.php">
<MoreSpecificImplementedParamType occurrences="1"/>
</file>
<file src="apps/user_status/lib/Service/StatusService.php">
<MismatchingDocblockParamType occurrences="1">
<code>string|null</code>
</MismatchingDocblockParamType>
</file>
<file src="apps/workflowengine/lib/Check/AbstractStringCheck.php">
<NullArgument occurrences="1">
<code>null</code>
Expand Down Expand Up @@ -2503,6 +2495,9 @@
<InvalidScalarArgument occurrences="1">
<code>$levelNum</code>
</InvalidScalarArgument>
<TypeDoesNotContainType occurrences="1">
<code>$identifier === false</code>
</TypeDoesNotContainType>
</file>
<file src="core/Command/Maintenance/DataFingerprint.php">
<InvalidScalarArgument occurrences="1">
Expand Down Expand Up @@ -2561,11 +2556,6 @@
<code>1</code>
</InvalidScalarArgument>
</file>
<file src="core/Command/User/Setting.php">
<InvalidScalarArgument occurrences="1">
<code>$input-&gt;getOption('default-value')</code>
</InvalidScalarArgument>
</file>
<file src="core/Controller/ClientFlowLoginV2Controller.php">
<TypeDoesNotContainType occurrences="1">
<code>!is_string($stateToken)</code>
Expand Down Expand Up @@ -2874,8 +2864,11 @@
</MoreSpecificImplementedParamType>
</file>
<file src="lib/private/AppFramework/Utility/SimpleContainer.php">
<UndefinedMethod occurrences="1">
<UndefinedMethod occurrences="4">
<code>getName</code>
<code>isBuiltin</code>
<code>isBuiltin</code>
<code>isBuiltin</code>
</UndefinedMethod>
</file>
<file src="lib/private/Archive/TAR.php">
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"cs:fix": "php-cs-fixer fix",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"lint": "find . -name \\*.php -not -path './lib/composer/*' -not -path './build/stubs/*' -print0 | xargs -0 -n1 php -l",
"psalm": "psalm"
"psalm": "psalm",
"psalm:update-baseline": "psalm --update-baseline --set-baseline=build/psalm-baseline.xml"
}
}